Skip to content

X
xzxt-hcypgl-report
Commit b2428bdd by liulianglang
Options

合成作战工作室代码提交

parent 33be1114
Showing with 230 additions and 30 deletions
src/main/java/org/springblade/founder/hcypgl/controller/TbYwHcypglXxController.java
......@@ -3,6 +3,8 @@ package org.springblade.founder.hcypgl.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.gnsyrzlog.LogOper;
import org.springblade.founder.hcypgl.entity.TbYwDzqqFjVo;
import org.springblade.founder.hcypgl.entity.TbYwHcypglCygl;
......@@ -13,7 +15,7 @@ import org.springblade.founder.hcypgl.service.TbYwHcypglXxService;
import org.springblade.founder.utils.EasyUIPage;
import org.springblade.founder.utils.R;
import org.springblade.modules.system.entity.SysNewUser;
import org.springframework.util.StringUtils;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -289,5 +291,26 @@ public class TbYwHcypglXxController {
return;
}
@GetMapping(value = "/tqAsjxx")
public R tqAsjXx(@RequestParam(value = "asjbh") String asjbh, @RequestParam(value = "showMyArea") String showMyArea) {
TbYwHcypglXx asjxx = tbYwHcypglXxService.tqAsjxx(asjbh);
if (asjxx == null) {
R r = R.error("未找到有效的案事件信息");
r.setCode(202);
return r;
}
if (StringUtils.isNotEmpty(showMyArea) && "false".equals(showMyArea)) {
String djdwdm = asjxx.getXxdjdwGajgjgdm();
XzxtUser user = SecureUtil.getUserXzxt();
List<String> areaAllUnitcodeList = tbYwHcypglXxService.getAreaAllUnitcodeList(user.getUnitcode());
//if (!areaAllUnitcodeList.contains(ladwdm)) {
if (!areaAllUnitcodeList.contains(djdwdm)) {
return R.error("当前案件非本辖区登记的案件，请输入本辖区内的案件信息");
}
}
Map<String, Object> result = new HashMap<>(16);
result.put("result", asjxx);
return R.ok().data(result);
}
}
src/main/java/org/springblade/founder/hcypgl/entity/TbYwHcypglFkxx.java
......@@ -87,6 +87,10 @@ public class TbYwHcypglFkxx implements Serializable {
* 更新时间
*/
private Date gxsj;
private String grade;
private String fkbtxx;
// 更新人员
public void setUpUser(XzxtUser user){
......@@ -102,7 +106,7 @@ public class TbYwHcypglFkxx implements Serializable {
this.xxdjryXm=user.getRealname();
this.xxdjdwGajgjgdm=user.getUnitcode();
this.xxdjdwGajgmc=user.getUnitname();
this.grade=user.getGrade();
this.xxdjryGmsfhm=user.getIdentitycard();
this.xxdjryLxdh=user.getPhone();
this.xxscPdbz="0";
......
src/main/java/org/springblade/founder/hcypgl/entity/TbYwHcypglXx.java
......@@ -41,12 +41,12 @@ public class TbYwHcypglXx implements Serializable {
* 案件类别代码
*/
private String ajlbdm;
private String ajlbdmStr;
/**
* 立案单位代码
*/
private String ladwdm;
private String ladwdmStr;
/**
* 简要案情
*/
......@@ -61,7 +61,7 @@ public class TbYwHcypglXx implements Serializable {
* 线索类型
*/
private String xslx;
private String xslxStr;
/**
* 线索号码
*/
......
src/main/java/org/springblade/founder/hcypgl/mapper/TbYwHcypglXxMapper.java
......@@ -25,6 +25,10 @@ public interface TbYwHcypglXxMapper {
* @return 实例对象
*/
TbYwHcypglXx queryById(String xxzjbh);
TbYwHcypglXx getAsjInfoByAsjbh(String asjbh);
String queryZtById(String xxzjbh);
List<String> getAreaAllUnitcodes(String unitcode);
/**
* 查询指定行数据
......@@ -57,7 +61,7 @@ public interface TbYwHcypglXxMapper {
int insert(TbYwHcypglXx tbYwHcypglXx);
int insertFkXx(TbYwHcypglFkxx tbYwHcypglFkxx);
int updateFkXx(TbYwHcypglFkxx tbYwHcypglFkxx);
TbYwHcypglFkxx selectFkXxOne(String xxzjbh);
List<TbYwHcypglFkxx> selectFkXxOne(String xxzjbh);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
......@@ -111,6 +115,6 @@ public interface TbYwHcypglXxMapper {
int selectCyglListCount(SysNewUser sysNewUser)throws Exception;
List<SysNewUser> selectCyglList(SysNewUser sysNewUser)throws Exception;
String selectJsXxOne (String userId);
String selectJsXxOne (TbYwHcypglCygl tbYwHcypglCygl);
}
src/main/java/org/springblade/founder/hcypgl/mapper/TbYwHcypglXxMapper.xml
......@@ -5,11 +5,41 @@
<!--查询单个-->
<select id="queryById" resultType="org.springblade.founder.hcypgl.entity.TbYwHcypglXx">
select
xxzjbh,asjbh, ajmc, ajlbdm, ladwdm, jayq, larq, xslx, xshm, xsms, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from xzxt.tb_yw_hcypgl_xx
xxzjbh,asjbh, ajmc, ajlbdm,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = ajlbdm) ajlbdmStr,
ladwdm, jayq,
(select name from sys_dictitem where groupid='CODE_UNIT' AND code=ladwdm) as ladwdmStr,
(select name from sys_dictitem where groupid='CODE_BKLXDM' AND code=xslx) as xslxStr,
larq, xslx, xshm, xsms, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from tb_yw_hcypgl_xx
where xxzjbh = #{xxzjbh}
</select>
<!--查询单个-->
<select id="queryZtById" resultType="java.lang.String">
select
xzzt from tb_yw_hcypgl_xx
where xxzjbh = #{xxzjbh}
</select>
<select id="getAsjInfoByAsjbh" resultType="org.springblade.founder.hcypgl.entity.TbYwHcypglXx">
select a.asjbh asjbh,
a.ajmc ajmc,
a.ajlbdm ajlbdm,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = a.ajlbdm) ajlbmc,
a.ladw_gajgjgdm ladwdm,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = a.ajlbdm) as ladwdmStr ,
jyaq as jayq, xxdjdw_gajgjgdm as xxdjdwGajgjgdm,
larq
from tb_st_asj a
where a.asjbh = #{asjbh}
and a.xxsc_pdbz = '0'
</select>
<select id="getAreaAllUnitcodes" resultType="java.lang.String">
select code
from sys_dictitem_xz
where code like '${unitcode}%'
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultType="org.springblade.founder.hcypgl.entity.TbYwHcypglXx">
select
......@@ -32,13 +62,20 @@
<!--通过实体作为筛选条件查询-->
<select id="queryAll" resultType="org.springblade.founder.hcypgl.entity.TbYwHcypglXx">
select
xxzjbh,asjbh, ajmc, ajlbdm, ladwdm, jayq, larq, xslx, xshm, xsms, sqsj, spr_sfzh, spyj, spsj, xzzt,
xxzjbh,asjbh, ajmc,
(select name from sys_dictitem where groupid='CODE_UNIT' AND code=ladwdm) as ladwdmStr,
(select name from sys_dictitem where groupid='CODE_BKLXDM' AND code=xslx) as xslxStr,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = ajlbdm) ajlbdmStr,
ajlbdm, ladwdm, jayq, larq, xslx, xshm, xsms, sqsj, spr_sfzh, spyj, spsj, xzzt,
(case when xzzt = '0' then '草稿' when xzzt = '1' then '待审批' when xzzt = '2' then '审批不通过' when xzzt = '4' then '待本级反馈'
when xzzt = '5' then '本级已反馈' when xzzt = '6' then '待审批' when xzzt = '8' then '审批不通过'
when xzzt = '9' then '待上级反馈'
when xzzt = '10' then '上级已反馈'
when xzzt = '11' then '上级已反馈'
when xzzt = '12' then '本级已反馈'
else '已完成' end) as xzztStr,grade,
xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj,
xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from tb_yw_hcypgl_xx
<where>
......@@ -138,7 +175,7 @@
<if test="sfbj == 'bxq'.toString()">
<if test="grade == 'S'.toString()">
and xxdjdw_gajgjgdm like concat( #{unitcode},'%')
and xzzt in ('9','10')
and ( (grade ='X' and xzzt in ('9','10','11','12') ) or grade ='D')
</if>
<if test="grade == 'D'.toString()">
and xxdjdw_gajgjgdm like concat( #{unitcode},'%')
......@@ -162,6 +199,9 @@
and xxdjdw_gajgjgdm like concat( #{unitcode},'%')
and grade =#{grade} and xzzt in ('1')
</if>
<if test="grade == 'S'.toString()">
and xzzt in ('18')
</if>
</if>
<if test="dwcxsql !=null and dwcxsql!=''">
......@@ -271,8 +311,8 @@
</insert>
<insert id="insertFkXx" >
insert into tb_yw_hcypgl_fkxx(xxzjbh,glxxzjbh, xxsc_pdbz, fknr, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj)
values (#{xxzjbh},#{glxxzjbh}, #{xxscPdbz},#{fknr} , #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
insert into tb_yw_hcypgl_fkxx(xxzjbh,glxxzjbh, xxsc_pdbz, fknr, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj,grade)
values (#{xxzjbh},#{glxxzjbh}, #{xxscPdbz},#{fknr} , #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj}, #{grade})
</insert>
<!--通过主键修改数据-->
......@@ -650,12 +690,13 @@
<!--查询单个-->
<select id="selectFkXxOne" resultType="org.springblade.founder.hcypgl.entity.TbYwHcypglFkxx">
select
xxzjbh, glxxzjbh, fknr, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
xxzjbh, glxxzjbh, fknr, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh,
djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj,grade
from tb_yw_hcypgl_fkxx
where glxxzjbh = #{xxzjbh}
</select>
<select id="selectJsXxOne" resultType="java.lang.String">
select cyjs from tb_yw_hcypgl_cygl where xxsc_pdbz='0' and glxxzjbh=#{userId}
select cyjs from tb_yw_hcypgl_cygl where xxsc_pdbz='0' and glxxzjbh=#{glxxzjbh} and dwz=#{dwz}
</select>
<sql id="user-where">
......
src/main/java/org/springblade/founder/hcypgl/service/TbYwHcypglXxService.java
......@@ -24,6 +24,11 @@ public interface TbYwHcypglXxService {
* @return 实例对象
*/
TbYwHcypglXx queryById(String xxzjbh);
TbYwHcypglXx tqAsjxx(String asjbh);
List<String> getAreaAllUnitcodeList(String unitcode);
/**
* 查询多条数据
......@@ -84,7 +89,7 @@ public interface TbYwHcypglXxService {
TbYwHcypglFkxx insertFkXx(TbYwHcypglFkxx tbYwHcypglFkxx, MultipartFile fkfile);
TbYwHcypglFkxx updateFkXx(TbYwHcypglFkxx tbYwHcypglFkxx, MultipartFile fkfile);
TbYwHcypglFkxx selectFkXxOne(String id);
List<TbYwHcypglFkxx> selectFkXxOne(String id);
String selectJsXxOne(String id);
}
src/main/java/org/springblade/founder/hcypgl/service/impl/TbYwHcypglXxServiceImpl.java
......@@ -51,6 +51,28 @@ public class TbYwHcypglXxServiceImpl implements TbYwHcypglXxService {
return this.tbYwHcypglXxMapper.queryById(xxzjbh);
}
@Override
public TbYwHcypglXx tqAsjxx(String asjbh) {
return tbYwHcypglXxMapper.getAsjInfoByAsjbh(asjbh);
}
@Override
public List<String> getAreaAllUnitcodeList(String unitcode) {
XzxtUser user = SecureUtil.getUserXzxt();
String grade = user.getGrade();
if ("S".equals(grade)) {
unitcode = user.getUnitcode().substring(0, 2);
} else if ("D".equals(grade)) {
unitcode = user.getUnitcode().substring(0, 4);
} else if ("X".equals(grade)) {
unitcode = user.getUnitcode().substring(0, 6);
} else if ("K".equals(grade)) {
unitcode = user.getUnitcode().substring(0, 8);
}
return tbYwHcypglXxMapper.getAreaAllUnitcodes(unitcode);
}
/**
* 查询多条数据
*
......@@ -70,7 +92,7 @@ public class TbYwHcypglXxServiceImpl implements TbYwHcypglXxService {
String useId=xzxtUser.getTenantId();
String sfbjparam=tbYwXzqqXx.getSfbj();
//县级未反馈
String xwfkstr="4,6,7,8,9";
String xwfkstr="4,6,7,8,9,10,11";
//县级已反馈
String xfkstr="5,10";
System.out.println("id="+xzxtUser.getTenantId()+"cxid"+tbYwXzqqXx.getUserId());
......@@ -93,12 +115,12 @@ public class TbYwHcypglXxServiceImpl implements TbYwHcypglXxService {
if(!StringUtils.isEmpty(tbYwXzqqXx.getXzzt())){
if (!"D".equals(xzxtUser.getGrade()) && !"S".equals(xzxtUser.getGrade())) {
if("4".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('4','6','7','8','9')";
dwcxsql="and xzzt in ('4','6','7','8','9','11')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("5".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('5','10')";
dwcxsql="and xzzt in ('5','12')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
......@@ -116,26 +138,93 @@ public class TbYwHcypglXxServiceImpl implements TbYwHcypglXxService {
tbYwXzqqXx.setXzzt("");
}
if("4".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('4','9')";
dwcxsql="and xzzt in ('4','11')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("5".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('5','10')";
dwcxsql="and xzzt in ('5','12')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("9".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('9','4')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("11".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('11','5')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("bxq".equals(tbYwXzqqXx.getSfbj())){
if("1".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('6')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("2".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('8')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("4".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('4')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("5".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('5','12')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("9".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('9')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("11".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('11')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
}
}
if ("S".equals(xzxtUser.getGrade()) ) {
if("4".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('9','4')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("5".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('11','5')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("9".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('9','4')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
if("11".equals(tbYwXzqqXx.getXzzt())){
dwcxsql="and xzzt in ('11','5')";
tbYwXzqqXx.setDwcxsql(dwcxsql);
tbYwXzqqXx.setXzzt("");
}
}
}
/**
* 市级下级单位线索 1 2 4待本级反馈 5本级已反馈 9待上级反馈 11上级已反馈
* 省级下级单位线索 9待本级反馈 11本级已反馈
*/
List<TbYwHcypglXx> list=tbYwHcypglXxMapper.queryAll(tbYwXzqqXx);
/**
* 协作状态 0-草稿，1-待审批，2-审批不通过，3-审批通过，4-待市反馈，5-市已反馈，6-待市审批，7-市审批通过
* 8-市审批不通过 ，9-待省反馈，10-省已反馈
* 8-市审批不通过 ，9-待省反馈，10-省已反馈,11-省已反馈市未反馈，12-省已反馈市已反馈
*/
......@@ -156,6 +245,10 @@ public class TbYwHcypglXxServiceImpl implements TbYwHcypglXxService {
xx.setXzztStr("待本级反馈");
}else if("10".equals(zt)){
xx.setXzztStr("本级已反馈");
}else if("11".equals(zt)){
xx.setXzztStr("本级已反馈");
}else if("12".equals(zt)){
xx.setXzztStr("本级已反馈");
}
}
......@@ -269,19 +362,49 @@ public class TbYwHcypglXxServiceImpl implements TbYwHcypglXxService {
}
@Override
public TbYwHcypglFkxx selectFkXxOne(String id) {
TbYwHcypglFkxx xx=tbYwHcypglXxMapper.selectFkXxOne(id);
public List<TbYwHcypglFkxx> selectFkXxOne(String id) {
List<TbYwHcypglFkxx> list=tbYwHcypglXxMapper.selectFkXxOne(id);
for(TbYwHcypglFkxx xx:list ) {
List<TbYwDzqqFjVo> fj = tbYwHcypglXxMapper.selectFjInfo(null, xx.getXxzjbh());
if(fj!=null){
if (fj != null) {
fj = encodeToString(fj);
xx.setWj(fj);
}
return xx;
String zt=tbYwHcypglXxMapper.queryZtById(id);
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
xx.setFkbtxx("本级反馈信息");
if("X".equals(xzxtUser.getGrade())){
xx.setFkbtxx("上级反馈信息");
}else if("D".equals(xzxtUser.getGrade())){
if("S".equals(xx.getGrade())){
xx.setFkbtxx("上级反馈信息");
}else {
xx.setFkbtxx("本级反馈信息");
}
}else {
xx.setFkbtxx("本级反馈信息");
}
}
return list;
}
@Override
public String selectJsXxOne(String id) {
return tbYwHcypglXxMapper.selectJsXxOne(id);
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
TbYwHcypglCygl tbYwHcypglCygl=new TbYwHcypglCygl();
String dm = xzxtUser.getUnitcode();
String grade = xzxtUser.getGrade();
if ("T".equals(grade) || "S".equals(grade)) {
dm = dm.substring(0, 2);
} else if ("D".equals(grade)) {
dm = dm.substring(0, 4);
} else if ("X".equals(grade)) {
dm = dm.substring(0, 8);
} else if ("K".equals(grade)) {
dm = dm.substring(0, 10);
}
tbYwHcypglCygl.setDwz(dm);
tbYwHcypglCygl.setGlxxzjbh(id);
return tbYwHcypglXxMapper.selectJsXxOne(tbYwHcypglCygl);
}
......
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