From 96fbfd8fc1684c4124c5901571c7a0aa1f548296 Mon Sep 17 00:00:00 2001 From: pengwei Date: Fri, 20 Jun 2025 17:46:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E4=BA=8C=E7=BA=A7=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E4=BC=98=E5=8C=96=EF=BC=9B2=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=BB=B4=E6=9D=83=E6=95=B0=E6=8D=AE=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=EF=BC=9B3=E3=80=81=E6=8A=BD=E6=A3=80?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datav/DataVRightsComfortController.java | 12 +- .../subdatav/SubOneRightsController.java | 2 +- .../java/com/biutag/supervision/job/Job.java | 9 +- .../mapper/DwdRyZfbaBaryxxMapper.java | 6 + .../supervision/mapper/RpcApplyMapper.java | 21 +-- .../supervision/mapper/SamplingMapper.java | 17 +++ .../mapper/SamplingPoliceMapper.java | 7 + .../supervision/pojo/entity/Sampling.java | 93 +++++++++++++ .../pojo/entity/SamplingPolice.java | 28 ++++ .../pojo/param/SamplingQueryParam.java | 51 +++++++ .../supervision/pojo/vo/SamplingVo.java | 76 +++++++++++ .../service/DwdRyZfbaBaryxxService.java | 7 + .../service/RpcApplySuperviseService.java | 18 +-- .../supervision/service/SampliingService.java | 128 ++++++++++++++++++ src/main/resources/mapper/SamplingMapper.xml | 14 ++ .../resources/mapper/SamplingPoliceMapper.xml | 7 + 16 files changed, 467 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/mapper/SamplingMapper.java create mode 100644 src/main/java/com/biutag/supervision/mapper/SamplingPoliceMapper.java create mode 100644 src/main/java/com/biutag/supervision/pojo/entity/Sampling.java create mode 100644 src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java create mode 100644 src/main/java/com/biutag/supervision/pojo/param/SamplingQueryParam.java create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java create mode 100644 src/main/java/com/biutag/supervision/service/SampliingService.java create mode 100644 src/main/resources/mapper/SamplingMapper.xml create mode 100644 src/main/resources/mapper/SamplingPoliceMapper.xml diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java index 826c453..b71851f 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.biutag.supervision.constants.enums.RpcApplyTypeEnum; import com.biutag.supervision.mapper.RpcApplyMapper; import com.biutag.supervision.mapper.RpcInfringerResultMapper; @@ -257,11 +258,12 @@ public class DataVRightsComfortController { // 发案警种 List incidentPoliceList = rpcApplyMapper.getIncidentPolice(beginTime, endTime); List supDictDataList = supDictDataService.list( new LambdaQueryWrapper().eq(SupDictData::getDictType,"personType")); - incidentPoliceList.forEach(s->{ - Optional supDictData = supDictDataList.stream().filter(v->v.getDictValue().equals(s.getName())).findFirst(); - supDictData.ifPresent(dictData -> s.setName(dictData.getDictLabel())); - }); - + if(CollectionUtils.isNotEmpty(incidentLinkList)){ + incidentPoliceList.forEach(s->{ + Optional supDictData = supDictDataList.stream().filter(v->v.getDictValue().equals(s.getName())).findFirst(); + supDictData.ifPresent(dictData -> s.setName(dictData.getDictLabel())); + }); + } // 发案单位 List incidentOrgList = rpcApplyMapper.getIncidentOrg(beginTime, endTime); diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java index 9d58ab1..1c818c8 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneRightsController.java @@ -132,7 +132,7 @@ public class SubOneRightsController { List incidentLinkList = rpcApplyMapper.getSubOneIncidentLink(beginTime, endTime,departId); // 发案警种 - List incidentPoliceList = rpcApplyMapper.getIncidentPolice(beginTime, endTime,departId); + List incidentPoliceList = rpcApplyMapper.getSubOneIncidentPolice(beginTime, endTime,departId); List supDictDataList = supDictDataService.list(new LambdaQueryWrapper().eq(SupDictData::getDictType,"personType")); incidentPoliceList.forEach(s->{ Optional supDictData = supDictDataList.stream().filter(v->v.getDictValue().equals(s.getName())).findFirst(); diff --git a/src/main/java/com/biutag/supervision/job/Job.java b/src/main/java/com/biutag/supervision/job/Job.java index 308ab04..43a5a0e 100644 --- a/src/main/java/com/biutag/supervision/job/Job.java +++ b/src/main/java/com/biutag/supervision/job/Job.java @@ -142,7 +142,7 @@ public class Job { DwdAsjZfbaAjjbxx ajjbxx = dwdAsjZfbaAjjbxxMapper.selectByAjbh(item.getAjbh()); //获取办案人id if(StrUtil.isNotEmpty(ajjbxx.getBar1id())){ - DwdRyZfbaBaryxx dwdRyZfbaBaryxx = dwdRyZfbaBaryxxService.getById(ajjbxx.getBar1id()); + DwdRyZfbaBaryxx dwdRyZfbaBaryxx = dwdRyZfbaBaryxxService.selectDataById(ajjbxx.getBar1id()); if(ObjectUtil.isNotEmpty(dwdRyZfbaBaryxx)){ SupPolice policeData = policeService.getByIdCode(dwdRyZfbaBaryxx.getZjhm()); rpcApply.setInputEmpNo(policeData.getEmpNo()); @@ -150,9 +150,6 @@ public class Job { } - - - //获取单位进行处理 if(StrUtil.isNotEmpty(ajjbxx.getBadwidmc())){ @@ -195,7 +192,8 @@ public class Job { //受害人列表 RpcApplyPerson rpcApplyPerson= new RpcApplyPerson(); rpcApplyPerson.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()); - rpcApplyPerson.setInjurySeverity(item.getShcdmc()); + //受伤程度屏蔽 +// rpcApplyPerson.setInjurySeverity(item.getShcdmc()); rpcApplyPerson.setCreatTime(LocalDateTime.now()); rpcApplyPerson.setUdpTime(LocalDateTime.now()); rpcApplyPerson.setId(IdUtil.fastSimpleUUID()); @@ -212,6 +210,7 @@ public class Job { if(ObjectUtil.isNotEmpty(police)){ rpcApplyPerson.setEmpType(police.getJobType()); } + //存储受害人信息 rpcApplyPersonService.save(rpcApplyPerson); diff --git a/src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java b/src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java index 2dbec27..24432a3 100644 --- a/src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java @@ -2,8 +2,14 @@ package com.biutag.supervision.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.biutag.supervision.pojo.entity.DwdAsjZfbaShrxx2; import com.biutag.supervision.pojo.entity.DwdRyZfbaBaryxx; +import org.apache.ibatis.annotations.Select; + +import java.util.List; @DS("slave2") public interface DwdRyZfbaBaryxxMapper extends BaseMapper { + @Select("select * from dwd_ry_zfba_baryxx where zj = #{bid} ") + DwdRyZfbaBaryxx selectDataById(String bid); } diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java index 2441c11..07889da 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java @@ -109,7 +109,7 @@ public interface RpcApplyMapper extends BaseMapper { List getIncidentLink(Date beginTime, Date endTime); - @Select("SELECT person_type as name,COUNT(*) from rpc_apply a " + + @Select("SELECT person_type as name,COUNT(*) as value from rpc_apply a " + "LEFT JOIN (SELECT emp_no,person_type from sup_police WHERE del = 0) as b " + "ON a.input_emp_no = b.emp_no " + "WHERE a.crt_time BETWEEN #{beginTime} and #{endTime}" + @@ -118,12 +118,12 @@ public interface RpcApplyMapper extends BaseMapper { - @Select("SELECT person_type as name,COUNT(*) from rpc_apply a " + + @Select("SELECT person_type as name,COUNT(*) as value from rpc_apply a " + "LEFT JOIN (SELECT emp_no,person_type from sup_police WHERE del = 0) as b " + "ON a.input_emp_no = b.emp_no " + "WHERE a.crt_time BETWEEN #{beginTime} and #{endTime} and a.second_depart_id = #{deptId} " + " GROUP BY person_type HAVING name is NOT NULL") - List getIncidentPolice(Date beginTime, Date endTime,Integer deptId); + List getSubOneIncidentPolice(Date beginTime, Date endTime,Integer deptId); @@ -237,7 +237,7 @@ public interface RpcApplyMapper extends BaseMapper { * 按事发时间进行筛选 * 维权案件情况 * */ - @Select(" select sdp.short_name,COUNT(*) as value from rpc_apply ra " + + @Select(" select sdp.short_name as label,COUNT(*) as value from rpc_apply ra " + " LEFT JOIN sup_depart sdp on ra.second_depart_id = sdp.id " + " WHERE sdp.statistics_group_id = #{departGroupId} and ra.type =1 " + " and ra.crt_time BETWEEN #{beginTime} and #{endTime} " + @@ -249,7 +249,7 @@ public interface RpcApplyMapper extends BaseMapper { * 按事发时间进行筛选 * 维权案件情况派出所-二级大屏 * */ - @Select(" SELECT sdp.short_name , COUNT(*) as value from rpc_apply ra " + + @Select(" SELECT sdp.short_name as label, COUNT(*) as value from rpc_apply ra " + " left join sup_depart sdp on ra.depart_id = sdp.id " + " where sdp.pid = #{departId} " + " and ra.type =1 and sdp.statistics_group_id = #{departGroupId} " + @@ -260,7 +260,7 @@ public interface RpcApplyMapper extends BaseMapper { * 按事发时间进行筛选 * 维权案件情况大队-二级大屏 * */ - @Select(" SELECT sdp.short_name , COUNT(*) as value from rpc_apply ra " + + @Select(" SELECT sdp.short_name as label , COUNT(*) as value from rpc_apply ra " + " left join sup_depart sdp on ra.depart_id = sdp.id " + " where sdp.pid = #{departId} " + " and ra.type =1 and sdp.statistics_group_id != #{departGroupId} " + @@ -270,7 +270,7 @@ public interface RpcApplyMapper extends BaseMapper { //二级大屏抚慰金额-派出所 @Select("SELECT " + - " depart_name as name, " + + " sdp.short_name as label , " + " ROUND(sum(p.provide_relief) / 10000, 2) as value " + " from rpc_apply_person p " + " left join rpc_apply r on p.rpc_id = r.rpc_id " + @@ -280,11 +280,12 @@ public interface RpcApplyMapper extends BaseMapper { " and r.type = 2 " + " and sdp.statistics_group_id = #{departGroupId}" + " and r.crt_time between #{beginTime} and #{endTime} " + - " GROUP BY depart_name") + " GROUP BY sdp.short_name" + + " order by value desc ") List selectSubProtectRightsBarList(Date beginTime, Date endTime, Integer departId, Integer departGroupId); //二级大屏抚慰金额-大队 @Select("SELECT " + - " depart_name as name, " + + " sdp.short_name as label, " + " ROUND(sum(p.provide_relief) / 10000, 2) as value " + " from rpc_apply_person p " + " left join rpc_apply r on p.rpc_id = r.rpc_id " + @@ -294,7 +295,7 @@ public interface RpcApplyMapper extends BaseMapper { " and r.type = 2 " + " and sdp.statistics_group_id != #{departGroupId}" + " and r.crt_time between #{beginTime} and #{endTime} " + - " GROUP BY depart_name") + " GROUP BY sdp.short_name order by value desc ") List selectSubComfortMoneyBarList(Date beginTime, Date endTime, Integer departId, Integer departGroupId); diff --git a/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java b/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java new file mode 100644 index 0000000..4dc4d38 --- /dev/null +++ b/src/main/java/com/biutag/supervision/mapper/SamplingMapper.java @@ -0,0 +1,17 @@ +package com.biutag.supervision.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.pojo.entity.RpcApply; +import com.biutag.supervision.pojo.entity.Sampling; +import com.biutag.supervision.pojo.vo.RpcApplyVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + + +public interface SamplingMapper extends BaseMapper { + + Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/src/main/java/com/biutag/supervision/mapper/SamplingPoliceMapper.java b/src/main/java/com/biutag/supervision/mapper/SamplingPoliceMapper.java new file mode 100644 index 0000000..be2fda1 --- /dev/null +++ b/src/main/java/com/biutag/supervision/mapper/SamplingPoliceMapper.java @@ -0,0 +1,7 @@ +package com.biutag.supervision.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.biutag.supervision.pojo.entity.SamplingPolice; + +public interface SamplingPoliceMapper extends BaseMapper { +} diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java b/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java new file mode 100644 index 0000000..463e31a --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/entity/Sampling.java @@ -0,0 +1,93 @@ +package com.biutag.supervision.pojo.entity; + +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +/** + * 抽检规则 + * */ +@Getter +@Setter +public class Sampling { + @TableId + private String id; + + //抽检名称 + @TableField("sampling_name") + private String samplingName; + //督察类型 + @TableField("inspector_type") + private String inspectorType; + //年龄范围 + //最大年龄 + @TableField("age_max") + private int ageMax; + //最小年龄 + @TableField("age_min") + private int ageMin; + //性别 + @TableField("gender") + private String gender; + //人员属性 + @TableField("personnel_type") + private String personnelType; + //是否违法6项规定 + @TableField("drink_alcohol") + private String drinkAlcohol; + //抽检人数 + @TableField("sampling_num") + private int samplingNum; + //领导人数 + @TableField("leaders_number") + private int leadersNumber; + //民警比例 + @TableField("police_ratio") + private int policeRatio; + //辅警比例 + @TableField("assist_ratio") + private int assistRatio; + //时间范围 + //开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + @TableField("start_time") + private DateTime startTime; + //结束时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + @TableField("end_time") + private DateTime endTime; + //被抽检次数 + @TableField("sampling_number") + private int samplingNumber; + //距离最后一次检测时间 + @TableField("distance_day") + private int distanceDay; + //是否值班人员 + @TableField("be_duty") + private String beDuty; + //抽检对象 + @TableField("sampling_obj") + private String samplingObj; + //是否使用 + @TableField("employ") + private String employ; + /** + * 创建单位 + * */ + @TableField("org_id") + private String orgId; + /** + * 创建人名称 + */ + @TableField("crt_name") + String crtName; + //创建时间 + @TableField("crt_time") + LocalDateTime crtTime; + +} diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java b/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java new file mode 100644 index 0000000..aa5d840 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java @@ -0,0 +1,28 @@ +package com.biutag.supervision.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SamplingPolice { + @TableId + private String id; + //警号 + @TableField("emp_no") + private String empNo; + //警员姓名 + @TableField("name") + private String name; + //部门id + @TableField("dept_id") + private String deptId; + //抽检id + @TableField("sampling_id") + private String samplingId; + //是否领导 + @TableField("是否为领导") + private String isLeader; +} diff --git a/src/main/java/com/biutag/supervision/pojo/param/SamplingQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/SamplingQueryParam.java new file mode 100644 index 0000000..853f99b --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/param/SamplingQueryParam.java @@ -0,0 +1,51 @@ +package com.biutag.supervision.pojo.param; + +import cn.hutool.core.date.DateTime; +import com.biutag.supervision.pojo.entity.SamplingPolice; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; +//抽检规则入参 +@Data +public class SamplingQueryParam extends BasePage{ + private String id; + //抽检名称 + private String samplingName; + //督察类型 + private String inspectorType; + //年龄范围 + //最大年龄 + private int ageMax; + //最小年龄 + private int ageMin; + //性别 + private String gender; + //人员属性 + private String personnelType; + //是否违法6项规定 + private String drinkAlcohol; + + //领导人数 + private int leadersNumber; + //民警比例 + private int policeRatio; + //辅警比例 + private int assistRatio; + //时间范围 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private List samplingTime; + + //被抽检次数 + private int samplingNumber; + + //是否值班人员 + private String beDuty; + + +} + + + + diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java new file mode 100644 index 0000000..5e9f6e6 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java @@ -0,0 +1,76 @@ +package com.biutag.supervision.pojo.vo; + +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.biutag.supervision.pojo.entity.SamplingPolice; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class SamplingVo { + + private String id; + + //抽检名称 + private String samplingName; + //督察类型 + private String inspectorType; + //年龄范围 + //最大年龄 + private int ageMax; + //最小年龄 + private int ageMin; + //性别 + private String gender; + //人员属性 + private String personnelType; + //是否违法6项规定 + private String drinkAlcohol; + //抽检人数 + private int samplingNum; + //领导人数 + private int leadersNumber; + //民警比例 + private int policeRatio; + //辅警比例 + private int assistRatio; + //时间范围 + //开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private DateTime startTime; + //结束时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private DateTime endTime; + //被抽检次数 + @TableField("sampling_number") + private int samplingNumber; + //距离最后一次检测时间 + private int distanceDay; + //是否值班人员 + private String beDuty; + //创建单位 + @TableField("org_id") + private String orgId; + //创建人名称 + @TableField("crt_name") + String crtName; + //创建时间 + LocalDateTime crtTime; + //抽检对象 + private String samplingObj; + + private List samplingObjectList; + + private List samplingPolices; +} + + +class SamplingObject{ + private String deptId; + + private String value; +} diff --git a/src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java b/src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java index 60e3754..18b5f7d 100644 --- a/src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java +++ b/src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java @@ -2,9 +2,16 @@ package com.biutag.supervision.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.biutag.supervision.mapper.DwdRyZfbaBaryxxMapper; +import com.biutag.supervision.pojo.entity.DwdAsjZfbaShrxx2; import com.biutag.supervision.pojo.entity.DwdRyZfbaBaryxx; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class DwdRyZfbaBaryxxService extends ServiceImpl { + + public DwdRyZfbaBaryxx selectDataById(String bid) { + return baseMapper.selectDataById(bid); + } } diff --git a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java index 86c1f44..285a84a 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java +++ b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java @@ -1,6 +1,7 @@ package com.biutag.supervision.service; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -51,16 +52,17 @@ public class RpcApplySuperviseService extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())) { - List rightPeoples = rpcRightPersonService.list(user.getUserName()); - if (rightPeoples.isEmpty()) { - return new Page().setTotal(0).setRecords(new ArrayList<>()); +// Set departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet()); + List orgIds = new ArrayList<>(); + if(StrUtil.isNotBlank(user.getDepartId())){ + orgIds.add(user.getDepartId()); } - // 是否是市局维权专干 - if (rightPeoples.stream().noneMatch(item -> "1".equals(item.getCouncil()))) { - Set departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet()); - List childrenIds = departService.getAllNodeIds(departIds); - queryWrapper.in("a.handle_depart_id", childrenIds); + if(CollectionUtil.isNotEmpty(orgIds)){ + log.info("'user-data--------'"+user.getDepartId()); + orgIds.addAll(departService.getAllNodeIds(user.getAuthDepartIds())); } + queryWrapper.in("a.handle_depart_id", orgIds); + } //待处理维权 if("1".equals(queryParam.getActiveName())){ diff --git a/src/main/java/com/biutag/supervision/service/SampliingService.java b/src/main/java/com/biutag/supervision/service/SampliingService.java new file mode 100644 index 0000000..f3194eb --- /dev/null +++ b/src/main/java/com/biutag/supervision/service/SampliingService.java @@ -0,0 +1,128 @@ +package com.biutag.supervision.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.intern.InternUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.util.IntUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervision.common.UserContextHolder; +import com.biutag.supervision.constants.AppConstants; +import com.biutag.supervision.constants.enums.RoleCodeEnum; +import com.biutag.supervision.mapper.SamplingMapper; +import com.biutag.supervision.mapper.SamplingPoliceMapper; +import com.biutag.supervision.pojo.entity.Confinement; +import com.biutag.supervision.pojo.entity.Sampling; +import com.biutag.supervision.pojo.entity.SamplingPolice; +import com.biutag.supervision.pojo.model.UserAuth; +import com.biutag.supervision.pojo.param.SamplingQueryParam; +import com.biutag.supervision.pojo.vo.ConfinementVo; +import com.biutag.supervision.pojo.vo.SamplingVo; +import lombok.RequiredArgsConstructor; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class SampliingService extends ServiceImpl { + + //抽检警察人员表 + private final SamplingPoliceMapper samplingPoliceMapper; + + private final SupDepartService departService; + //添加或者修改 + public boolean addOrUpdata(SamplingVo vo){ + Sampling sampling =new Sampling(); + BeanUtil.copyProperties(vo,sampling); + UserAuth user = UserContextHolder.getCurrentUser(); + sampling.setCrtTime(LocalDateTime.now()); + sampling.setCrtName(user.getUserName()); + if (StrUtil.isNotEmpty(vo.getId())){ + //判断有无警员列表 + samplingPoliceMapper.delete(new LambdaQueryWrapper().eq(SamplingPolice::getSamplingId,sampling.getId())); + } + if(ArrayUtil.isNotEmpty(vo.getSamplingPolices())){ + samplingPoliceMapper.insert(vo.getSamplingPolices()); + } + return baseMapper.insertOrUpdate(sampling); + } + //分页查询 + public Page page(SamplingQueryParam queryParam){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + UserAuth user = UserContextHolder.getCurrentUser(); + // 权限 + if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) { + if (user.getAuthDepartIds().isEmpty() || user.getRoleCodes().isEmpty()) { + return new Page().setTotal(0).setRecords(new ArrayList<>()); + } + List orgIds = departService.getAllNodeIds(user.getAuthDepartIds()); + queryWrapper.in("c1.org_id", orgIds); + } + //查询条件 + queryWrapper.eq(StrUtil.isNotBlank(queryParam.getSamplingName()),"sampling_name",queryParam.getSamplingName()) + .eq(StrUtil.isNotBlank(queryParam.getInspectorType()),"inspector_type",queryParam.getInspectorType()) + .eq(StrUtil.isNotBlank(queryParam.getGender()),"gender",queryParam.getGender()) + .eq(StrUtil.isNotBlank(queryParam.getPersonnelType()),"personnel_type",queryParam.getPersonnelType()) + .eq(StrUtil.isNotBlank(queryParam.getDrinkAlcohol()),"drink_alcohol",queryParam.getDrinkAlcohol()) + .eq(StrUtil.isNotBlank(queryParam.getBeDuty()),"be_duty",queryParam.getBeDuty()); + //抽检领导次数 + if(queryParam.getLeadersNumber() != 0 ){ + queryWrapper.eq("leaders_number",queryParam.getLeadersNumber()); + } + //年龄范围 + if (queryParam.getAgeMax()!= 0){ + queryWrapper.ge("age_min",queryParam.getAgeMin()); + queryWrapper.le("age_max",queryParam.getAgeMax()); + } + //警员比率 + if (queryParam.getPoliceRatio() != 0){ + queryWrapper.eq("police_ratio",queryParam.getPoliceRatio()); + } + //辅警比率 + if(queryParam.getAssistRatio() != 0){ + queryWrapper.eq("assist_ratio",queryParam.getAssistRatio()); + } + //数据查询 + if(CollectionUtils.isEmpty(queryParam.getSamplingTime())){ + queryWrapper.ge("start_time",queryParam.getSamplingTime().get(0)); + queryWrapper.le("end_time",queryParam.getSamplingTime().get(1)); + } + + + Page page= baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); + List listData = new ArrayList<>(); + page.getRecords().forEach(s->{ + SamplingVo samplingVo =new SamplingVo(); + BeanUtil.copyProperties(s,samplingVo); + samplingVo.setSamplingPolices(samplingPoliceMapper.selectList(new LambdaQueryWrapper().eq(SamplingPolice::getSamplingId,s.getId()))); + listData.add(samplingVo); + }); + Page voPage = new Page<>(page.getCurrent(),page.getSize(),page.getTotal()); + voPage.setRecords(listData); + return voPage; + } + //删除数据 + public boolean delDataById(SamplingQueryParam queryParam){ + List list = samplingPoliceMapper.selectList(new LambdaQueryWrapper().eq(SamplingPolice::getSamplingId,queryParam.getId())); + if(CollectionUtil.isNotEmpty(list)){ + samplingPoliceMapper.deleteByIds(list.stream().map(SamplingPolice::getId).toList()); + } + + return baseMapper.deleteById(queryParam.getId()) > 0; + } + + + +} diff --git a/src/main/resources/mapper/SamplingMapper.xml b/src/main/resources/mapper/SamplingMapper.xml new file mode 100644 index 0000000..27fd295 --- /dev/null +++ b/src/main/resources/mapper/SamplingMapper.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/main/resources/mapper/SamplingPoliceMapper.xml b/src/main/resources/mapper/SamplingPoliceMapper.xml new file mode 100644 index 0000000..6b6f58f --- /dev/null +++ b/src/main/resources/mapper/SamplingPoliceMapper.xml @@ -0,0 +1,7 @@ + + + + +