Skip to content

Z
zczlService
Commit 3a297bff by mayunfei
Options

Merge remote-tracking branch 'remotes/origin/master'

parents 55e67f1f 0cdad0ec
Showing with 1083 additions and 11 deletions
pom.xml
......@@ -68,6 +68,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<!-- 数据库驱动包-->
......
src/main/java/com/founder/model/TbYwZczl.java
......@@ -16,6 +16,8 @@ import java.util.List;
@SuppressWarnings("serial")
public class TbYwZczl extends BaseModel{
private String username = null;
private String zdsprjh = null;//指定审批人警号
private List ywbhList;//业务编号list
private String ifFirst;//是否首次查询 no表示非第一次查询
private String zlfpdwHtml = "";//指令分派单位拼接用的html
......@@ -876,4 +878,20 @@ public class TbYwZczl extends BaseModel{
public void setYwbhList(List ywbhList) {
this.ywbhList = ywbhList;
}
public String getZdsprjh() {
return zdsprjh;
}
public void setZdsprjh(String zdsprjh) {
this.zdsprjh = zdsprjh;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
}
src/main/java/com/founder/model/TbYwZczlSpqx.java 0 → 100644
package com.founder.model;
import java.util.Date;
import java.util.List;
/**
* 审批权限相关表
*/
public class TbYwZczlSpqx extends BaseModel{
private String userId = null;//用户id
private String xm = null;//姓名
private String dwmc = null;//单位名称
private String lxdh = null;//联系电话
private String policemanid = null;//警号
private String unitcode = null;//单位代码
private String xxzjbh = null;//信息主键编号
private String ywlx = null;//业务类型
private String ywlxStr = null;//业务类型str
private String fpqxzt;//分配权限状态 N-未分配 Y-已分配
private String xxsc_pdbz = "0";
private String xxdjry_xm = null;
private String xxdjry_gmsfhm = null;
private String xxdjry_lxdh = null;
private String xxdjdw_gajgmc = null;
private String xxdjdw_gajgjgdm = null;
private String xxczry_gmsfhm = null;
private String xxczry_xm = null;
private String xxczdw_gajgjgdm = null;
private String xxczdw_gajgmc = null;
private String xxlyms = null;
private Date djsj = null;
private Date gxsj = null;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getXxzjbh() {
return xxzjbh;
}
public void setXxzjbh(String xxzjbh) {
this.xxzjbh = xxzjbh;
}
public String getYwlx() {
return ywlx;
}
public void setYwlx(String ywlx) {
this.ywlx = ywlx;
}
public String getXxsc_pdbz() {
return xxsc_pdbz;
}
public void setXxsc_pdbz(String xxsc_pdbz) {
this.xxsc_pdbz = xxsc_pdbz;
}
public String getXxdjry_xm() {
return xxdjry_xm;
}
public void setXxdjry_xm(String xxdjry_xm) {
this.xxdjry_xm = xxdjry_xm;
}
public String getXxdjry_gmsfhm() {
return xxdjry_gmsfhm;
}
public void setXxdjry_gmsfhm(String xxdjry_gmsfhm) {
this.xxdjry_gmsfhm = xxdjry_gmsfhm;
}
public String getXxdjry_lxdh() {
return xxdjry_lxdh;
}
public void setXxdjry_lxdh(String xxdjry_lxdh) {
this.xxdjry_lxdh = xxdjry_lxdh;
}
public String getXxdjdw_gajgmc() {
return xxdjdw_gajgmc;
}
public void setXxdjdw_gajgmc(String xxdjdw_gajgmc) {
this.xxdjdw_gajgmc = xxdjdw_gajgmc;
}
public String getXxdjdw_gajgjgdm() {
return xxdjdw_gajgjgdm;
}
public void setXxdjdw_gajgjgdm(String xxdjdw_gajgjgdm) {
this.xxdjdw_gajgjgdm = xxdjdw_gajgjgdm;
}
public String getXxczry_gmsfhm() {
return xxczry_gmsfhm;
}
public void setXxczry_gmsfhm(String xxczry_gmsfhm) {
this.xxczry_gmsfhm = xxczry_gmsfhm;
}
public String getXxczry_xm() {
return xxczry_xm;
}
public void setXxczry_xm(String xxczry_xm) {
this.xxczry_xm = xxczry_xm;
}
public String getXxczdw_gajgjgdm() {
return xxczdw_gajgjgdm;
}
public void setXxczdw_gajgjgdm(String xxczdw_gajgjgdm) {
this.xxczdw_gajgjgdm = xxczdw_gajgjgdm;
}
public String getXxczdw_gajgmc() {
return xxczdw_gajgmc;
}
public void setXxczdw_gajgmc(String xxczdw_gajgmc) {
this.xxczdw_gajgmc = xxczdw_gajgmc;
}
public String getXxlyms() {
return xxlyms;
}
public void setXxlyms(String xxlyms) {
this.xxlyms = xxlyms;
}
public Date getDjsj() {
return djsj;
}
public void setDjsj(Date djsj) {
this.djsj = djsj;
}
public Date getGxsj() {
return gxsj;
}
public void setGxsj(Date gxsj) {
this.gxsj = gxsj;
}
public String getXm() {
return xm;
}
public void setXm(String xm) {
this.xm = xm;
}
public String getDwmc() {
return dwmc;
}
public void setDwmc(String dwmc) {
this.dwmc = dwmc;
}
public String getLxdh() {
return lxdh;
}
public void setLxdh(String lxdh) {
this.lxdh = lxdh;
}
public String getYwlxStr() {
return ywlxStr;
}
public void setYwlxStr(String ywlxStr) {
this.ywlxStr = ywlxStr;
}
public String getPolicemanid() {
return policemanid;
}
public void setPolicemanid(String policemanid) {
this.policemanid = policemanid;
}
public String getUnitcode() {
return unitcode;
}
public void setUnitcode(String unitcode) {
this.unitcode = unitcode;
}
public String getFpqxzt() {
return fpqxzt;
}
public void setFpqxzt(String fpqxzt) {
this.fpqxzt = fpqxzt;
}
}
src/main/java/com/founder/redis/controller/DictController.java
......@@ -30,6 +30,8 @@ public class DictController {
if (type != null && !"".equals(type)) {
if(type.equals("CODE_JY")){
ZTreeNodeList = dicItemService.queryTypeUsercode(startId,name);//查询警员字典
}if(type.equals("CODE_SPJY")){
ZTreeNodeList = dicItemService.queryTypeSpUsercode(startId,name);//查询具有相应业务审批权限的警员字典
}else if("0".equals(isInit)){//非初始化调用
ZTreeNodeList = dicItemService.queryTypeCode(type,id,startId,yycj,name);
ZTreeNodeList=Sort(ZTreeNodeList);
......@@ -84,6 +86,8 @@ public class DictController {
if (code_type != null && !"".equals(code_type)) {
if("CODE_JY".equals(code_type)){
ZTreeNodeList = dicItemService.queryTypeUsercode(startId,name);//查询警员字典
}else if("CODE_SPJY".equals(code_type)){
ZTreeNodeList = dicItemService.queryTypeSpUsercode(startId,name);//查询具有相应业务审批权限的警员字典
}else{
ZTreeNodeList = dicItemService.getZtreeNodeByName(code_type,id,startId,yycj,unitcode,name);
}
......
src/main/java/com/founder/redis/dao/IDictitemDao.java
......@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -29,4 +30,8 @@ public interface IDictitemDao {
int updateNode(ZTreeNode node);
List<User> queryAllUnitUser(Map m);
String getNameByCode(HashMap<String, String> codeMap);
List<User> queryAllUserByUserIdList(List<String> userIdList);
}
src/main/java/com/founder/redis/service/IDicItemService.java
......@@ -58,4 +58,6 @@ public interface IDicItemService {
List<ZTreeNode> queryTypeUsercode(String startId,String name);
List<ZTreeNode> queryAllCode(String type);
List<ZTreeNode> queryTypeSpUsercode(String startId, String name);
}
src/main/java/com/founder/redis/service/impl/IDicItemServiceImpl.java
......@@ -116,6 +116,39 @@ public class IDicItemServiceImpl implements IDicItemService {
return zTreeNodeList;
}
/**
* 查询具有相应业务审批权限的警员字典
* @param startId
* @param name
* @return
*/
@Override
public List<ZTreeNode> queryTypeSpUsercode(String startId, String name) {
List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>();
List<User> users = new ArrayList<>();
//业务类型不为空时，拿到所有具备该业务权限的人的信息
if(startId!=null&&!"".equals(startId.trim())){
List<String> userIdList = zczlDao.queryAllUserIdByYwlx(startId);
if(userIdList!=null&&userIdList.size()>0){
users = dicItemDao.queryAllUserByUserIdList(userIdList);
}
}
if(users!=null&&users.size()>0){//封装成node对象
for(int i=0;i<users.size();i++){
ZTreeNode node = new ZTreeNode();
User user = users.get(i);
node.setState(null); //显示叶子图标
node.setIds(user.getId());
node.setName(user.getTrueName());
node.setCodeType("CODE_SPJY");
node.setText(user.getTrueName());
node.setId(user.getPolicemanid());
ztreeNodes.add(node);
}
}
return ztreeNodes;
}
@Override
public List<ZTreeNode> queryTypeCode(String type, String id, String startId, String yycj, String name) {
List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>();
......
src/main/java/com/founder/zczl/dao/ZczlDao.java
......@@ -146,4 +146,16 @@ public interface ZczlDao {
void updateQsxxByMapForYj(Map map);
void updateFpxxByMapForYj(Map map);
List<TbYwZczlSpqx> toQuerySpUserList(TbYwZczlSpqx tbYwZczlSpqx);
Integer toQuerySpUserListForTotal(TbYwZczlSpqx tbYwZczlSpqx);
TbYwZczlSpqx getFpqxxxByUserId(String userId);
void insertQxfp(TbYwZczlSpqx tbYwZczlSpqx);
int updateQxfp(TbYwZczlSpqx tbYwZczlSpqx);
List<String> queryAllUserIdByYwlx(String startId);
}
src/main/java/com/founder/zczl/service/IZczlService.java
......@@ -135,4 +135,14 @@ public interface IZczlService {
boolean doUpdateZlxxByLly(RyUpdateMessage ryUpdateMessage);
boolean doYj(TbYwZczlFp tbYwZczlFp, String identitycard);
List<TbYwZczlSpqx> toQuerySpUserList(TbYwZczlSpqx tbYwZczlSpqx);
Integer toQuerySpUserListForTotal(TbYwZczlSpqx tbYwZczlSpqx);
List<SysDictitem> getAllYwlx();
Map getFpqxxxByUserId(String userId);
String doQxfp(TbYwZczlSpqx tbYwZczlSpqx);
}
src/main/java/com/founder/zczl/service/impl/ZczlService.java
package com.founder.zczl.service.impl;
import com.founder.model.*;
import com.founder.redis.dao.IDictitemDao;
import com.founder.seq.dao.AutoSeqDao;
import com.founder.model.Sequence;
import com.founder.seq.service.SequenceConfig;
......@@ -37,6 +38,9 @@ public class ZczlService implements IZczlService {
@Value("${ssdw}")
private String ssdw;
@Autowired
IDictitemDao dictitemDao;
/**
* 判断用户是否为所属单位的联络员
......@@ -1715,4 +1719,99 @@ public class ZczlService implements IZczlService {
}
return bool;
}
//审批权限查询与设置--start
@Override
public List<TbYwZczlSpqx> toQuerySpUserList(TbYwZczlSpqx tbYwZczlSpqx) {
List<TbYwZczlSpqx> spqxList = zczlDao.toQuerySpUserList(tbYwZczlSpqx);
if(spqxList!=null&&spqxList.size()>0){
//业务类型可能为多个且用英文符号的逗号分隔，翻译代码值
for(int i=0;i<spqxList.size();i++){
TbYwZczlSpqx spqxTemp = spqxList.get(i);
String ywlx = spqxTemp.getYwlx();
if(ywlx!=null&&!"".equals(ywlx.trim())){
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 = dictitemDao.getNameByCode(codeMap);
if(t==0){
ywlxStr = name;
}else{
ywlxStr +=","+name;
}
spqxTemp.setYwlxStr(ywlxStr);
}
}
}
}
return spqxList;
}
@Override
public Integer toQuerySpUserListForTotal(TbYwZczlSpqx tbYwZczlSpqx) {
return zczlDao.toQuerySpUserListForTotal(tbYwZczlSpqx);
}
@Override
public List<SysDictitem> getAllYwlx() {
return dictitemDao.findCodeAllByType("CODE_YWLXDM");
}
@Override
public Map getFpqxxxByUserId(String userId) {
List<String> qxList = new ArrayList<>();
String qxStr = null;
TbYwZczlSpqx spqx = zczlDao.getFpqxxxByUserId(userId);
if(spqx!=null){
qxStr = spqx.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
* @return
*/
@Override
public String doQxfp(TbYwZczlSpqx tbYwZczlSpqx) {
String flag = "0";
TbYwZczlSpqx spqx = zczlDao.getFpqxxxByUserId(tbYwZczlSpqx.getUserId());
//判断是否分配过权限
if(spqx==null){//insert操作
try{
String xxzjbh = xxzjbhFnVal();
tbYwZczlSpqx.setXxzjbh(xxzjbh);
zczlDao.insertQxfp(tbYwZczlSpqx);
flag = "1";
} catch (Exception e) {
throw new BaseException("新增审批权限出错！",e);
}
}else{//update操作
try{
int t = zczlDao.updateQxfp(tbYwZczlSpqx);
flag = ""+t;
} catch (Exception e) {
throw new BaseException("修改审批权限出错！",e);
}
}
return flag;
}
//审批权限查询与设置--end
}
src/main/resources/mapper/DictitemSqlMap.xml
......@@ -67,4 +67,23 @@
<if test="true_name!=null and true_name!=''">and TRUE_NAME like '%'||#{true_name, jdbcType=VARCHAR}||'%'</if>
</select>
<select id="getNameByCode" parameterType="java.util.Map" resultType="java.lang.String">
select name from SYS_DICTITEM where scbz='0'
<if test="groupid!=null and groupid!=''">and groupid = #{groupid}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
</select>
<select id="queryAllUserByUserIdList" resultType="com.founder.model.User" parameterType="java.util.List" >
select
ID as id,
TRUE_NAME as trueName,
POLICEMANID as policemanid
from sys_user where scbz='0' and OPEN_FLAG='1'
and id in
<foreach collection="list" item="userId" index="index"
open="(" close=")" separator=",">
#{userId, jdbcType=VARCHAR}
</foreach>
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/LoginMapper.xml
......@@ -8,6 +8,7 @@
IDENTITYCARD identitycard,
TELEPHONE telephone,
GRADE grade,
ID id,
USERNAME username,
UNITNAME unitname,
PASSWORD password,
......
src/main/resources/mapper/ZczlMapper.xml
......@@ -196,6 +196,7 @@
zczl.XXSCPDBZ xxscpdbz,
<!-- zczl.DZWJWZ dzwjwz, -->
zczl.FQRJH fqrjh,
zczl.ZDSPRJH zdsprjh,
zczl.SPYJ spyj
from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0'
<include refid="wfzdzczl-where"/>
......@@ -566,6 +567,7 @@
TSCLRDWMC tsclrdwmc,
XXSCPDBZ xxscpdbz,
FQRJH fqrjh,
ZDSPRJH zdsprjh,
SPYJ spyj
from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0'
<include refid="wfqdzczl-where"/>
......@@ -609,13 +611,15 @@
<if test="ywmc!=null and ywmc!=''">and zczl.ywmc like '%'||#{ywmc, jdbcType=VARCHAR}||'%'</if>
<if test="zllx!=null and zllx!=''"> and zczl.zllx = #{zllx, jdbcType=VARCHAR}</if>
<if test="ywlx!=null and ywlx!=''"> and zczl.ywlx = #{ywlx, jdbcType=VARCHAR}</if>
<if test="ifFirst!='no'">
<if test="ifFirst!='no' and username!='admin'"><!-- 第一次查询且用户不为admin时查询指定的业务类型指令 -->
and zczl.ywlx in
<foreach collection="ywbhList" item="lxlist" index="index"
open="(" close=")" separator=",">
#{lxlist, jdbcType=VARCHAR}
</foreach>
and (zczl.ZDSPRJH is null or zczl.ZDSPRJH = #{zdsprjh, jdbcType=VARCHAR})
</if>
<if test="spsftg!=null and spsftg!=''"> and zczl.spsftg = #{spsftg, jdbcType=VARCHAR}</if>
<if test="zljsdwdm!=null and zljsdwdm!=''">and ${zljsdwdm}</if>
<if test="fbsj_s!=null and fbsj_s!=''">and zczl.fbsj <![CDATA[>=]]> (to_date(#{fbsj_s, jdbcType=VARCHAR},'yyyy-MM-dd'))</if>
......@@ -669,6 +673,7 @@
TSCLRDWMC tsclrdwmc,
XXSCPDBZ xxscpdbz,
FQRJH fqrjh,
ZDSPRJH zdsprjh,
SPYJ spyj
from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0'
<include refid="xywspdzczl-where"/>
......@@ -869,6 +874,7 @@
qqfqrgmsfhm,
qqrjh,
sfqqzl,
ZDSPRJH,
XXSCPDBZ
) values (
<if test="zczlbh!=null">#{zczlbh},</if>
......@@ -920,6 +926,8 @@
<if test="qqrjh==null">NULL,</if>
<if test="sfqqzl!=null">#{sfqqzl},</if>
<if test="sfqqzl==null">'0',</if>
<if test="zdsprjh!=null">#{zdsprjh},</if>
<if test="zdsprjh==null">NULL,</if>
0
)
<selectKey resultType="java.lang.String" keyProperty="zczlbh">
......@@ -983,6 +991,7 @@
(select name from sys_dictitem where groupid='CODE_UNIT' and code=zczl.qqfqrgajgdm) as qqfqrdwmc,
zczl.QQRJH qqrjh,
zczl.SFQQZL sfqqzl,
zczl.ZDSPRJH zdsprjh,
zczl.QQFQRGMSFHM qqfqrgmsfhm
from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0' and zczl.zczlbh=#{zczlbh}
......@@ -1056,6 +1065,8 @@
<if test="zlsy==null || zlsy==''">,zlsy=NULL</if>
<if test="gzyq!=null and gzyq!=''">,gzyq=#{gzyq}</if>
<if test="gzyq==null || gzyq==''">,gzyq=NULL</if>
<if test="zdsprjh!=null and zdsprjh!=''">,ZDSPRJH=#{zdsprjh}</if>
<if test="zdsprjh==null || zdsprjh==''">,ZDSPRJH=NULL</if>
where zczlbh=#{zczlbh}
</update>
......@@ -1374,6 +1385,7 @@
zczl.TSCLRDWMC tsclrdwmc,
zczl.XXSCPDBZ xxscpdbz,
zczl.FQRJH fqrjh,
zczl.ZDSPRJH zdsprjh,
zczl.SPYJ spyj
from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0'
<include refid="bxqjsdzczl-where"/>
......@@ -1619,6 +1631,7 @@
TSCLRDWMC tsclrdwmc,
XXSCPDBZ xxscpdbz,
FQRJH fqrjh,
ZDSPRJH zdsprjh,
SPYJ spyj
from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0'
<include refid="wfqqdzczl-where"/>
......@@ -1708,4 +1721,128 @@
,FPRGMSFHM =#{newSfzh,jdbcType=VARCHAR}
where FPRGMSFHM=#{oldSfzh,jdbcType=VARCHAR} and YFPBH is not null and ZCZLBH=#{zczlbh,jdbcType=VARCHAR}
</update>
<!-- 审批权限查询与设置start -->
<sql id="spqx-where">
<if test="unitcode!=null and unitcode!=''"> and u.UNITCODE = #{unitcode, jdbcType=VARCHAR}</if>
<if test="xm!=null and xm!=''"> and u.TRUE_NAME like '%'||#{xm, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and u.POLICEMANID like '%'||#{policemanid, jdbcType=VARCHAR}||'%'</if>
<if test="ywlx!=null and ywlx!=''"> and spqx.ywlx like '%'||#{ywlx, jdbcType=VARCHAR}||'%'</if>
<if test="fpqxzt==1"> and spqx.USERID=u.ID </if><!-- 已经分配 -->
<if test="fpqxzt==0"> and u.id not in (select userid from TB_YW_ZCZL_SPQX where xxsc_pdbz='0') </if><!-- 未分配 -->
order by u.id
</sql>
<select id="toQuerySpUserList" parameterType="com.founder.model.TbYwZczlSpqx" resultType="com.founder.model.TbYwZczlSpqx">
select * from (
select t.*,rownum rn from (
select
spqx.XXZJBH as xxzjbh,
u.id as userId,
spqx.YWLX as ywlx,
u.TRUE_NAME as xm,
(select name from sys_dictitem where groupid='CODE_UNIT' and code=u.UNITCODE) as dwmc,
u.TELEPHONE as lxdh,
u.POLICEMANID as policemanid,
u.UNITCODE as unitcode
from TB_YW_ZCZL_SPQX spqx,SYS_USER u
where 1=1
and u.SCBZ = '0' and u.OPEN_FLAG = '1'
and u.id in (select distinct(userid) from VW_USER_PERMISSION where id='A010101')
and u.id = spqx.USERID(+)
<include refid="spqx-where"/>
) t
WHERE ROWNUM <![CDATA[<=]]> #{end}
) WHERE RN > #{begin}
</select>
<select id="toQuerySpUserListForTotal" parameterType="com.founder.model.TbYwZczlSpqx" resultType="java.lang.Integer">
select count(*) from TB_YW_ZCZL_SPQX spqx,SYS_USER u
where 1=1 and u.SCBZ = '0' and u.OPEN_FLAG = '1'
and u.id in (select distinct(userid) from VW_USER_PERMISSION where id='A010101')
and u.id = spqx.USERID(+)
<include refid="spqx-where"/>
</select>
<select id="getFpqxxxByUserId" parameterType="java.lang.String" resultType="com.founder.model.TbYwZczlSpqx">
select XXZJBH as xxzjbh,
USERID as userId,
YWLX as ywlx
from TB_YW_ZCZL_SPQX where xxsc_pdbz=0 and USERID= #{userId, jdbcType=VARCHAR}
</select>
<insert id="insertQxfp" parameterType="com.founder.model.TbYwZczlSpqx">
insert into TB_YW_ZCZL_SPQX (
XXZJBH,
XXDJRY_XM,
XXCZRY_GMSFHM,
XXDJRY_GMSFHM,
XXCZRY_XM,
XXCZDW_GAJGJGDM,
XXCZDW_GAJGMC,
XXDJRY_LXDH,
XXDJDW_GAJGMC,
XXLYMS,
XXDJDW_GAJGJGDM,
USERID,
YWLX,
DJSJ,
GXSJ
)values(
<if test="xxzjbh!=null">#{xxzjbh},</if>
<if test="xxzjbh==null">NULL,</if>
<if test="xxdjry_xm!=null">#{xxdjry_xm},</if>
<if test="xxdjry_xm==null">NULL,</if>
<if test="xxczry_gmsfhm!=null">#{xxczry_gmsfhm},</if>
<if test="xxczry_gmsfhm==null">NULL,</if>
<if test="xxdjry_gmsfhm!=null">#{xxdjry_gmsfhm},</if>
<if test="xxdjry_gmsfhm==null">NULL,</if>
<if test="xxczry_xm!=null">#{xxczry_xm},</if>
<if test="xxczry_xm==null">NULL,</if>
<if test="xxczdw_gajgjgdm!=null">#{xxczdw_gajgjgdm},</if>
<if test="xxczdw_gajgjgdm==null">NULL,</if>
<if test="xxczdw_gajgmc!=null">#{xxczdw_gajgmc},</if>
<if test="xxczdw_gajgmc==null">NULL,</if>
<if test="xxdjry_lxdh!=null">#{xxdjry_lxdh},</if>
<if test="xxdjry_lxdh==null">NULL,</if>
<if test="xxdjdw_gajgmc!=null">#{xxdjdw_gajgmc},</if>
<if test="xxdjdw_gajgmc==null">NULL,</if>
<if test="xxlyms!=null">#{xxlyms},</if>
<if test="xxlyms==null">NULL,</if>
<if test="xxdjdw_gajgjgdm!=null">#{xxdjdw_gajgjgdm},</if>
<if test="xxdjdw_gajgjgdm==null">NULL,</if>
<if test="userId!=null">#{userId},</if>
<if test="userId==null">NULL,</if>
<if test="ywlx!=null">#{ywlx},</if>
<if test="ywlx==null">NULL,</if>
sysdate,sysdate
)
<selectKey resultType="java.lang.String" keyProperty="xxzjbh">
select #{xxzjbh} as xxzjbh from dual
</selectKey>
</insert>
<update id="updateQxfp" parameterType="com.founder.model.TbYwZczlSpqx" >
update TB_YW_ZCZL_SPQX
set
GXSJ = sysdate
,XXCZRY_XM =#{xxczry_xm,jdbcType=VARCHAR}
,XXCZRY_GMSFHM =#{xxczry_gmsfhm,jdbcType=VARCHAR}
,XXCZDW_GAJGJGDM =#{xxczdw_gajgjgdm,jdbcType=VARCHAR}
,XXCZDW_GAJGMC =#{xxczdw_gajgmc,jdbcType=VARCHAR}
,YWLX =#{ywlx,jdbcType=VARCHAR}
where USERID=#{userId,jdbcType=VARCHAR}
</update>
<select id="queryAllUserIdByYwlx" parameterType="java.lang.String" resultType="java.lang.String">
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}||'%'
and u.scbz=0 and u.open_flag='1' and spqx.USERID = u.id
</select>
<!-- 审批权限查询与设置end -->
</mapper>
\ No newline at end of file
src/main/resources/static/js/spqxszList.js 0 → 100644
$(function(){
doQuery();
//拿到该省具有的所有业务类型
getAllYwlx();
})
function getColumn(row){
var str = "";
str = "<a href=\"#\" onclick=\"getQx('"+row.userId+"');\" class=\"cz\"><span style='color: #7fd015;'>设置权限</span></a>"
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:'/getFpqxxxByUserId?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: "/doQxfp",
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);;
}
var table_title = [
{title:"操作",field:"xxzjbh",align:'center',width:'10%',formatter:function(val,row,index){
return getColumn(row);
}},
{title:"姓名",field:"xm",align:'center',width:'15%'},
{title:"警号",field:"policemanid",align:'center',width:'7%'},
{title:"联系电话",field:"lxdh",align:'center',width:'10%'},
{title:"所属单位",field:"dwmc",align:'center',width:'20%'},
{title:"具备业务审批权限",field:"ywlxStr",align:'center',width:'40%',formatter : function(val,row,index){
return "<span style='width:100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;display: block;' title='"+row.ywlxStr+"'>"+row.ywlxStr+"</span>";
}}
];
function doQuery(){
$('#userxxtable').datagrid({
url: "/getSpUserList",
columns : [table_title],
striped : true,
queryParams:serializeObject($("form[name='userForm']")),
singleSelect:true,
nowrap:false, //设置是否换行，false换行，true不换行
fitColumns:true,
scrollbarSize: 0,
selectOnCheck : false,
checkOnSelect : false,
fit:false,
pagination : true,
pageSize : 10,
pageList : [10,20], //rows
pageNumber : 1,
loadFilter: function(data){
$(".total").html(data.total);
return data;
}
});
}
//将表单序列化
function serializeObject(form){
var o={};
$.each(form.serializeArray(),function(index){
if(o[this['name'] ]){
o[this['name'] ] = o[this['name'] ] + "," + this['value'];
}else{
o[this['name'] ]=this['value'];
}
})
return o;
}
function doClear(){
$("form input[type=text]:visible,form input[class='textbox-value']").val("");//将所有可见的input和class是textbox-value的input框 即代码选择框 的值清空
$("input[name='fpqxzt']:first").prop("checked",'checked');//默认选中全部
}
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);
}
});
}
\ No newline at end of file
src/main/resources/version.txt
......@@ -49,5 +49,7 @@ version=@project.version@
#29.增加联络员移交指令信息功能 01：将之前联络员分派、签收的指令给改成新的联络员信息
#30.增加指令移交功能 01：将之前联络员签收的指令，移交给同单位的另外一个人负责（避免出差导致指令不能及时回报的问题）
#31.添加配置 01：跨域登录成功时返回成功提示
#32.新增指令审批指定人功能 01：新增指定审批人功能(指定具有审批权限且具备该指令业务的审批权限的人进行审批)
#33.修改指令统计的bug 01：当开始或结束时间没有被选择时，会导致指令发布开始时间与结束时间都被置为null的bug
————————————————————@project.version@-——————————————————————————
src/main/webapp/WEB-INF/jsp/bxqjsdzczl.jsp
......@@ -93,7 +93,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -107,6 +107,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
src/main/webapp/WEB-INF/jsp/llycx.jsp
......@@ -93,7 +93,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -107,6 +107,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
src/main/webapp/WEB-INF/jsp/llysz.jsp
......@@ -96,7 +96,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -110,6 +110,9 @@
<li style='background-color: #337ab7' class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
src/main/webapp/WEB-INF/jsp/wfqdzczl.jsp
......@@ -93,7 +93,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -107,6 +107,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
src/main/webapp/WEB-INF/jsp/wfzdzczl.jsp
......@@ -98,7 +98,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -112,6 +112,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
src/main/webapp/WEB-INF/jsp/wqqfbdzczl.jsp
......@@ -93,7 +93,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -107,6 +107,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
src/main/webapp/WEB-INF/jsp/xywspdzczl.jsp
......@@ -141,7 +141,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -155,6 +155,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
src/main/webapp/WEB-INF/jsp/zczl_qqxdzl.jsp
......@@ -96,7 +96,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -110,6 +110,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......@@ -165,6 +168,13 @@
<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>
</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'"/>
</span>
</td>
<td class="ar necessary" width="13.3%">侦查指令类型：</td>
<td width="20%">
<span class="textbox">
......@@ -266,6 +276,22 @@
<script type="text/javascript">
$(document).ready(function(){
var hiddenZpsprjh = $("#hiddenZpsprjh").val();
$('#zdsprjh').combotree('setValue',hiddenZpsprjh);
$('#ywlx').combotree({
onChange: function (n,o) {
debugger
//控制类案中的代码值
$('#zdsprjh').combobox('clear');
//$('#zdsprjh').combobox('setValue','');
//$('#zdsprjh').combobox('selected',false);
// "selected":true
$('#zdsprjh').combobox({
url: "/queryTypeCode?type=CODE_SPJY&startId="+n
});
}
});
if("${flag}" == "1"){//添加成功
layer.alert("保存成功！","提示",function(res){
......
src/main/webapp/WEB-INF/jsp/zczl_xdzl.jsp
......@@ -96,7 +96,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -110,6 +110,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......@@ -165,6 +168,13 @@
<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>
</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'"/>
</span>
</td>
<td class="ar necessary" width="13.3%">侦查指令类型：</td>
<td width="20%">
<span class="textbox">
......@@ -266,6 +276,22 @@
<script type="text/javascript">
$(document).ready(function(){
var hiddenZpsprjh = $("#hiddenZpsprjh").val();
$('#zdsprjh').combotree('setValue',hiddenZpsprjh);
$('#ywlx').combotree({
onChange: function (n,o) {
debugger
//控制类案中的代码值
$('#zdsprjh').combobox('clear');
//$('#zdsprjh').combobox('setValue','');
//$('#zdsprjh').combobox('selected',false);
// "selected":true
$('#zdsprjh').combobox({
url: "/queryTypeCode?type=CODE_SPJY&startId="+n
});
}
});
if("${flag}" == "1"){//添加成功
layer.alert("保存成功！","提示",function(res){
......
src/main/webapp/WEB-INF/jsp/zczltj.jsp
......@@ -102,7 +102,7 @@
</li>
<li>
<a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 联络员
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span>
<i class="fa fa-sort-up"></i>
</span>
......@@ -116,6 +116,9 @@
<li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a>
</li>
<li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a>
</li>
</ul>
</li>
</ul>
......
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