Skip to content

Q
qianhe-ydsj
Commit 187cebeb by wangqi
Options

体系贯通

parent 8810a0ca
Showing with 84 additions and 54 deletions
qianhe-common/src/main/java/com/qianhe/common/core/domain/entity/SysDept.java
...@@ -199,6 +199,18 @@ public class SysDept extends BaseEntity ...@@ -199,6 +199,18 @@ public class SysDept extends BaseEntity
this.children = children; this.children = children;
} }
public String getDwjb()
{
return dwjb;
}
public void settDwjb(String dwjb)
{
this.dwjb = dwjb;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
qianhe-system/src/main/java/com/qianhe/system/service/impl/SysDeptServiceImpl.java
...@@ -240,6 +240,14 @@ public class SysDeptServiceImpl implements ISysDeptService ...@@ -240,6 +240,14 @@ public class SysDeptServiceImpl implements ISysDeptService
public int insertDept(SysDept dept) public int insertDept(SysDept dept)
{ {
SysDept info = deptMapper.selectDeptById(dept.getParentId()); SysDept info = deptMapper.selectDeptById(dept.getParentId());
String dwjb = info.getDwjb();
if(StringUtils.isNotEmpty(dwjb)) {
int number = Integer.parseInt(dwjb) + 1;
dept.setDwjb(number+"");
}else{
dept.setDwjb("1");
}
// 如果父节点不为正常状态,则不允许新增子节点 // 如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
{ {
...@@ -259,6 +267,13 @@ public class SysDeptServiceImpl implements ISysDeptService ...@@ -259,6 +267,13 @@ public class SysDeptServiceImpl implements ISysDeptService
public int updateDept(SysDept dept) public int updateDept(SysDept dept)
{ {
SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
String dwjb = newParentDept.getDwjb();
if(StringUtils.isNotEmpty(dwjb)) {
int number = Integer.parseInt(dwjb) + 1;
dept.setDwjb(number+"");
}else{
dept.setDwjb("0");
}
SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
{ {
......
qianhe-system/src/main/resources/mapper/system/SysUserMapper.xml
...@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num" />
<result property="leader" column="leader" /> <result property="leader" column="leader" />
<result property="status" column="dept_status" /> <result property="status" column="dept_status" />
<result property="dwjb" column="dwjb" />
</resultMap> </resultMap>
<resultMap id="RoleResult" type="SysRole"> <resultMap id="RoleResult" type="SysRole">
...@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,d.dwjb,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjFybpZbController.java
...@@ -314,7 +314,7 @@ public class SjFybpZbController extends BaseController ...@@ -314,7 +314,7 @@ public class SjFybpZbController extends BaseController
sysDeptCb.setDeptId(sjFybpZb.getDeptId()); sysDeptCb.setDeptId(sjFybpZb.getDeptId());
SysDeptCb deptCb = sysDeptCbMapper.getInfoBydeptId(sysDeptCb); SysDeptCb deptCb = sysDeptCbMapper.getInfoBydeptId(sysDeptCb);
if(deptCb==null){ if(deptCb==null){
sjFybpZb.setJl("您单位基础信息未维护，请到部门管理中进行设置！"); sjFybpZb.setJl("该单位基础信息未维护，请到部门管理中进行设置！");
}else { }else {
if(StringUtils.isNotEmpty( deptCb.getDwlx() )){ if(StringUtils.isNotEmpty( deptCb.getDwlx() )){
String dwlx = deptCb.getDwlx(); String dwlx = deptCb.getDwlx();
......
qianhe-ydsj/src/main/java/com/qianhe/controller/SjLhscController.java
...@@ -57,37 +57,37 @@ public class SjLhscController extends BaseController ...@@ -57,37 +57,37 @@ public class SjLhscController extends BaseController
public TableDataInfo list(SjLhsc sjLhsc) public TableDataInfo list(SjLhsc sjLhsc)
{ {
startPage(); startPage();
String nd=""; String nd="";
if(StringUtils.isNotEmpty(sjLhsc.getNd())){ if(StringUtils.isNotEmpty(sjLhsc.getNd())){
nd=sjLhsc.getNd(); nd=sjLhsc.getNd();
} String startJd="";
String startJd=""; String endJd="";
String endJd=""; if(StringUtils.isNotEmpty(sjLhsc.getJd())){
if(StringUtils.isNotEmpty(sjLhsc.getJd())){ String jd=sjLhsc.getJd();
String jd=sjLhsc.getJd(); if("1".equals(jd)){
if("1".equals(jd)){ startJd=nd+"-01";
startJd=nd+"-01"; endJd=nd+"-03";
endJd=nd+"-03"; }else if("2".equals(jd)){
}else if("2".equals(jd)){ startJd=nd+"-04";
startJd=nd+"-04"; endJd=nd+"-06";
endJd=nd+"-06"; }if("3".equals(jd)){
}if("3".equals(jd)){ startJd=nd+"-07";
startJd=nd+"-07"; endJd=nd+"-09";
endJd=nd+"-09"; }if("4".equals(jd)){
}if("4".equals(jd)){ startJd=nd+"-10";
startJd=nd+"-10"; endJd=nd+"-12";
endJd=nd+"-12"; }else{
startJd=nd+"-01";
endJd=nd+"-12";
}
}else{ }else{
startJd=nd+"-01"; startJd=nd+"-01";
endJd=nd+"-12"; endJd=nd+"-12";
} }
}else{ sjLhsc.setStartJd(startJd);
startJd=nd+"-01"; sjLhsc.setEndJd(endJd);
endJd=nd+"-12";
} }
sjLhsc.setStartJd(startJd);
sjLhsc.setEndJd(endJd);
List<SjLhsc> list = sjLhscService.selectSjLhscList(sjLhsc); List<SjLhsc> list = sjLhscService.selectSjLhscList(sjLhsc);
return getDataTable(list); return getDataTable(list);
...@@ -104,34 +104,33 @@ public class SjLhscController extends BaseController ...@@ -104,34 +104,33 @@ public class SjLhscController extends BaseController
String nd=""; String nd="";
if(StringUtils.isNotEmpty(sjLhsc.getNd())){ if(StringUtils.isNotEmpty(sjLhsc.getNd())){
nd=sjLhsc.getNd(); nd=sjLhsc.getNd();
} String startJd="";
String startJd=""; String endJd="";
String endJd=""; if(StringUtils.isNotEmpty(sjLhsc.getJd())){
if(StringUtils.isNotEmpty(sjLhsc.getJd())){ String jd=sjLhsc.getJd();
String jd=sjLhsc.getJd(); if("1".equals(jd)){
if("1".equals(jd)){ startJd=nd+"-01";
startJd=nd+"-01"; endJd=nd+"-03";
endJd=nd+"-03"; }else if("2".equals(jd)){
}else if("2".equals(jd)){ startJd=nd+"-04";
startJd=nd+"-04"; endJd=nd+"-06";
endJd=nd+"-06"; }if("3".equals(jd)){
}if("3".equals(jd)){ startJd=nd+"-07";
startJd=nd+"-07"; endJd=nd+"-09";
endJd=nd+"-09"; }if("4".equals(jd)){
}if("4".equals(jd)){ startJd=nd+"-10";
startJd=nd+"-10"; endJd=nd+"-12";
endJd=nd+"-12"; }else{
startJd=nd+"-01";
endJd=nd+"-12";
}
}else{ }else{
startJd=nd+"-01"; startJd=nd+"-01";
endJd=nd+"-12"; endJd=nd+"-12";
} }
}else{ sjLhsc.setStartJd(startJd);
startJd=nd+"-01"; sjLhsc.setEndJd(endJd);
endJd=nd+"-12";
} }
sjLhsc.setStartJd(startJd);
sjLhsc.setEndJd(endJd);
List<SjLhsc> list = sjLhscService.selectSjLhscList(sjLhsc); List<SjLhsc> list = sjLhscService.selectSjLhscList(sjLhsc);
return getDataTable(list); return getDataTable(list);
} }
......
qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjFybpServiceImpl.java
...@@ -218,7 +218,7 @@ public class SjFybpServiceImpl implements ISjFybpService ...@@ -218,7 +218,7 @@ public class SjFybpServiceImpl implements ISjFybpService
} }
@Override @Override
// @DataScope(deptAlias = "d") @DataScope(deptAlias = "d")
public List<SjFybp> getFygz(SjFybp sjFybp) { public List<SjFybp> getFygz(SjFybp sjFybp) {
return sjFybpMapper.getFygz(sjFybp); return sjFybpMapper.getFygz(sjFybp);
} }
......
qianhe-ydsj/src/main/resources/mapper/SjFybpMapper.xml
...@@ -154,15 +154,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -154,15 +154,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getFygz" resultMap="SjFybpResult"> <select id="getFygz" resultMap="SjFybpResult">
select a.id zb_id,a.dept_id,d.dept_name,a.fyrq,a.fyje fyzje,b.id,b.fymc,b.fylx,b.fyje,b.fyms,IFNULL(sum(c.syje),0) ysyje from sj_fybp_zb a select a.id zb_id,a.dept_id,d.dept_name,a.fyrq,a.fyje fyzje,b.id,b.fymc,b.fylx,b.fyje,b.fyms,IFNULL(sum(c.syje),0) ysyje from sj_fybp_zb a
left join sj_fybp b on a.id=b.zb_id left join sj_fybp b on a.id=b.zb_id
left join sj_fybp_wh c on b.id=c.fybp_id left join sj_fybp_wh c on b.id=c.fybp_id
left join sys_dept d on a.dept_id=d.dept_id left join sys_dept d on a.dept_id=d.dept_id
where 1=1 where 1=1
and a.zt = '已批复'
<if test="deptId != null and deptId != ''"> and (a.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors))</if> <if test="deptId != null and deptId != ''"> and (a.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors))</if>
<if test="fylx != null and fylx != ''"> and b.fylx = #{fylx}</if> <if test="fylx != null and fylx != ''"> and b.fylx = #{fylx}</if>
<if test="fymc != null and fymc != ''"> and b.fymc like concat('%', #{fymc}, '%')</if> <if test="fymc != null and fymc != ''"> and b.fymc like concat('%', #{fymc}, '%')</if>
<if test="fyrq != null and fyrq != ''"> and a.fyrq = #{fyrq}</if> <if test="fyrq != null and fyrq != ''"> and a.fyrq = #{fyrq}</if>
${params.dataScope}
group by b.id order by a.sprq desc group by b.id order by a.sprq desc
</select> </select>
<select id="getFygzById" resultMap="SjFybpResult"> <select id="getFygzById" resultMap="SjFybpResult">
...@@ -183,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -183,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept d on a.dept_id=d.dept_id left join sys_dept d on a.dept_id=d.dept_id
left join sys_dict_data e on b.fylx=e.dict_value and e.dict_type='fy_lx' left join sys_dict_data e on b.fylx=e.dict_value and e.dict_type='fy_lx'
where 1=1 where 1=1
and a.zt = '已批复'
<if test="deptId != null and deptId != ''"> and (a.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors))</if> <if test="deptId != null and deptId != ''"> and (a.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors))</if>
<if test="fyrq != null and fyrq != ''"> and a.fyrq =#{fyrq}</if> <if test="fyrq != null and fyrq != ''"> and a.fyrq =#{fyrq}</if>
<if test="fylx != null and fylx != ''"> and b.fylx = #{fylx}</if> <if test="fylx != null and fylx != ''"> and b.fylx = #{fylx}</if>
...@@ -198,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -198,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept d on a.dept_id=d.dept_id left join sys_dept d on a.dept_id=d.dept_id
where 1=1 where 1=1
and a.zt = '已批复'
<if test="deptId != null and deptId != ''"> and (a.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors))</if> <if test="deptId != null and deptId != ''"> and (a.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors))</if>
<if test="fyrq != null and fyrq != ''"> and a.fyrq =#{fyrq}</if> <if test="fyrq != null and fyrq != ''"> and a.fyrq =#{fyrq}</if>
<if test="fylx != null and fylx != ''"> and b.fylx = #{fylx}</if> <if test="fylx != null and fylx != ''"> and b.fylx = #{fylx}</if>
......
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