diff --git a/src/main/java/com/biutag/supervision/constants/enums/ModelDistributionStateEnum.java b/src/main/java/com/biutag/supervision/constants/enums/DistributionStateEnum.java similarity index 74% rename from src/main/java/com/biutag/supervision/constants/enums/ModelDistributionStateEnum.java rename to src/main/java/com/biutag/supervision/constants/enums/DistributionStateEnum.java index ffe61b7..cd2b2e5 100644 --- a/src/main/java/com/biutag/supervision/constants/enums/ModelDistributionStateEnum.java +++ b/src/main/java/com/biutag/supervision/constants/enums/DistributionStateEnum.java @@ -8,12 +8,14 @@ import lombok.Getter; * @date 2024/10/17 */ @AllArgsConstructor -public enum ModelDistributionStateEnum { +public enum DistributionStateEnum { // 未分发 UNDISTRIBUTED("0"), // 已分发 - DISTRIBUTED("1"); + DISTRIBUTED("1"), + // 已处置 + HANDLED("2"); @Getter private String value; diff --git a/src/main/java/com/biutag/supervision/controller/data/DataCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/data/DataCaseVerifController.java index 0d05d9c..4220db4 100644 --- a/src/main/java/com/biutag/supervision/controller/data/DataCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/data/DataCaseVerifController.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.constants.enums.DepartLevelEnum; import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.dto.DataCaseVerifDistribute; import com.biutag.supervision.pojo.dto.DataCaseVerifImportDto; import com.biutag.supervision.pojo.entity.DataCaseVerif; import com.biutag.supervision.pojo.entity.SupDepart; @@ -61,14 +62,14 @@ public class DataCaseVerifController { @Override public void invoke(DataCaseVerifImportDto data, AnalysisContext analysisContext) { String secondDepartId = secondDeparts.stream() - .filter(item -> item.getShortName().equals(data.getComplainedSecondDepartName())).findFirst() + .filter(item -> item.getShortName().equals(data.getInvolveSecondDepartName())).findFirst() .map(SupDepart::getId).orElse(""); - data.setComplainedSecondDepartId(secondDepartId); + data.setInvolveSecondDepartName(secondDepartId); if (StrUtil.isNotBlank(secondDepartId)) { String complainedThirdDepartId = departService.list(new LambdaQueryWrapper().eq(SupDepart::getPid, secondDepartId) - .like(SupDepart::getShortName, data.getComplainedThirdDepartName())) + .like(SupDepart::getShortName, data.getInvolveThirdDepartName())) .stream().findFirst().map(SupDepart::getId).orElse(""); - data.setComplainedThirdDepartId(complainedThirdDepartId); + data.setInvolveThirdDepartName(complainedThirdDepartId); } Set> validate = validator.validate(data); if (!validate.isEmpty()) { @@ -110,4 +111,9 @@ public class DataCaseVerifController { return Result.success(dataCaseVerifService.removeById(id)); } + @PostMapping("distribute") + public Result distribute(@RequestBody DataCaseVerifDistribute dataDistribute) { + return Result.success(dataCaseVerifService.distribution(dataDistribute)); + } + } diff --git a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java index 83e049b..ea1de35 100644 --- a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java +++ b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.constants.enums.DepartLevelEnum; import com.biutag.supervision.constants.enums.InitialPetition; import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.dto.DataDataPetitionComplainDistribute; import com.biutag.supervision.pojo.dto.DataPetitionComplaintAddDto; import com.biutag.supervision.pojo.dto.DataPetitionComplaintImportDto; import com.biutag.supervision.pojo.entity.DataPetitionComplaint; @@ -83,14 +84,14 @@ public class DataPetitionComplaintController { data.setInitialPetition(InitialPetition.getValue(data.getInitialPetition())); String secondDepartId = secondDeparts.stream() - .filter(item -> item.getShortName().equals(data.getComplainedSecondDepartName())).findFirst() + .filter(item -> item.getShortName().equals(data.getInvolveSecondDepartName())).findFirst() .map(SupDepart::getId).orElse(""); - data.setComplainedSecondDepartId(secondDepartId); + data.setInvolveSecondDepartName(secondDepartId); if (StrUtil.isNotBlank(secondDepartId)) { String complainedThirdDepartId = departService.list(new LambdaQueryWrapper().eq(SupDepart::getPid, secondDepartId) - .like(SupDepart::getShortName, data.getComplainedThirdDepartName())) + .like(SupDepart::getShortName, data.getInvolveThirdDepartName())) .stream().findFirst().map(SupDepart::getId).orElse(""); - data.setComplainedThirdDepartId(complainedThirdDepartId); + data.setInvolveThirdDepartName(complainedThirdDepartId); } Set> validate = validator.validate(data); if (!validate.isEmpty()) { @@ -125,4 +126,9 @@ public class DataPetitionComplaintController { return Result.success(dataPetitionComplaintService.removeById(id)); } + @PostMapping("distribute") + public Result distribute(@RequestBody DataDataPetitionComplainDistribute dataDistribute) { + return Result.success(dataPetitionComplaintService.distribution(dataDistribute)); + } + } diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVController.java new file mode 100644 index 0000000..69ac723 --- /dev/null +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVController.java @@ -0,0 +1,45 @@ +package com.biutag.supervision.controller.datav; + +import com.alibaba.fastjson.JSONObject; +import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.service.DataCaseVerifService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; + +/** + * @author wxc + * @date 2024/10/24 + */ +@RequestMapping("datav") +@RequiredArgsConstructor +@RestController +public class DataVController { + + private final DataCaseVerifService dataCaseVerifService; + + @GetMapping("caseVerif") + public Result caseVerif(Date beginTime, Date endTime) { + long total = dataCaseVerifService.count(); + long confirmed = 0; + JSONObject overview = new JSONObject() + // 案件总数（起） + .fluentPut("total", total) + // 查实案件数 + .fluentPut("confirmed", "") + // 查处问题（个） + .fluentPut("investigateAndPunish", 0) + // 问责人次 + .fluentPut("wzrc", 0) + // 问责单位数 + .fluentPut("wzdws", 0) + // 查实率 + .fluentPut("confirmedRate", confirmed / total * 100 + "%"); + JSONObject data = new JSONObject().fluentPut("overview", overview); + return Result.success(data); + } + +} diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifDistribute.java b/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifDistribute.java new file mode 100644 index 0000000..28179ed --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifDistribute.java @@ -0,0 +1,37 @@ +package com.biutag.supervision.pojo.dto; + +import com.biutag.supervision.pojo.entity.DataCaseVerif; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wxc + * @date 2024/10/24 + */ +@Setter +@Getter +public class DataCaseVerifDistribute { + + List data = new ArrayList<>(); + + // 办理时限 + @NotBlank + private String timeLimit; + + // 最大签收时长(天) + private Integer maxSignDuration; + + // 最大办理时长(天) + private Integer maxHandleDuration; + + // 最大延期时长(天) + private Integer maxExtensionDuration; + + // 审批流程 + @NotBlank + private String approvalFlow; +} diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java b/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java index f8d6941..d6461e4 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataCaseVerifImportDto.java @@ -50,16 +50,18 @@ public class DataCaseVerifImportDto { // 被投诉机构 @ExcelProperty({"问题基本信息", "涉及单位（二级机构）"}) - private String complainedSecondDepartName; + private String involveSecondDepartName; // 被投诉机构 @ExcelProperty({"问题基本信息", "涉及单位（三级机构）"}) - private String complainedThirdDepartName; + private String involveThirdDepartName; + @NotBlank(message = "涉及二级机构为空或与系统未匹配上") - private String complainedSecondDepartId; + private String involveSecondDepartId; + + private String involveThirdDepartId; - private String complainedThirdDepartId; // 具体内容 @ExcelProperty({"问题基本信息", "具体内容"}) @NotBlank(message = "具体内容为空") diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute.java b/src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute.java new file mode 100644 index 0000000..7f8a4b8 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataDataPetitionComplainDistribute.java @@ -0,0 +1,37 @@ +package com.biutag.supervision.pojo.dto; + +import com.biutag.supervision.pojo.entity.DataPetitionComplaint; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wxc + * @date 2024/10/24 + */ +@Setter +@Getter +public class DataDataPetitionComplainDistribute { + + List data = new ArrayList<>(); + + // 办理时限 + @NotBlank + private String timeLimit; + + // 最大签收时长(天) + private Integer maxSignDuration; + + // 最大办理时长(天) + private Integer maxHandleDuration; + + // 最大延期时长(天) + private Integer maxExtensionDuration; + + // 审批流程 + @NotBlank + private String approvalFlow; +} diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java index e9d5bcb..c365005 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java @@ -64,20 +64,18 @@ public class DataPetitionComplaintImportDto { @ExcelProperty({"信访基本信息", "业务类别"}) private String businessTypeName; - // 被投诉机构 - @ExcelProperty({"信访基本信息", "被投诉二级机构"}) - private String complainedSecondDepartName; - @NotBlank(message = "被投诉二级机构为空或与系统未匹配上") - private String complainedSecondDepartId; + private String involveSecondDepartName; - // + // 被投诉机构 @ExcelProperty({"信访基本信息", "被投诉所队"}) - private String complainedThirdDepartName; + private String involveThirdDepartName; + - private String complainedThirdDepartId; + @NotBlank(message = "涉及二级机构为空或与系统未匹配上") + private String involveSecondDepartId; - private String complainedDepartId; + private String involveThirdDepartId; // 具体内容 @ExcelProperty({"信访基本信息", "具体内容"}) diff --git a/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java b/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java index a79f4a7..1a2d7b3 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/NegativeDto.java @@ -18,6 +18,8 @@ public class NegativeDto { private String id; + private String originId; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm") private LocalDateTime happenTime; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java b/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java index d5860c6..3d05ef8 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DataCaseVerif.java @@ -18,12 +18,12 @@ public class DataCaseVerif { // 问题发现时间 @TableField("discovery_time") - @JsonFormat(pattern = "YYYY-MM-dd HH:mm") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm") private LocalDateTime discoveryTime; // 问题发生时间 @TableField("happen_time") - @JsonFormat(pattern = "YYYY-MM-dd HH:mm") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm") private LocalDateTime happenTime; // 问题来源 @@ -54,6 +54,8 @@ public class DataCaseVerif { @TableField("involve_depart_name") private String involveDepartName; + private String involveDepartId; + // 事情简述 @TableField("thing_desc") private String thingDesc; @@ -62,4 +64,7 @@ public class DataCaseVerif { @TableField("create_time") private LocalDateTime createTime; + // 分发状态 + private String distributionState; + } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java b/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java index e3efd73..e7990d1 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DataPetitionComplaint.java @@ -62,14 +62,6 @@ public class DataPetitionComplaint { @TableField("police_type_name") private String policeTypeName; - // 被投诉机构ID - @TableField("complained_depart_id") - private String complainedDepartId; - - // 被投诉机构 - @TableField("complained_depart_name") - private String complainedDepartName; - // 具体内容 @TableField("thing_desc") private String thingDesc; @@ -92,4 +84,7 @@ public class DataPetitionComplaint { // 来源 private String problemSourcesCode; + // 分发状态 + private String distributionState; + } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java b/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java index 4877610..5d73a97 100644 --- a/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java +++ b/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java @@ -33,7 +33,6 @@ public class ModelClueModel { // 涉及人员警号 private String involvePoliceEmpNo; - // 预警内容 private String thingDesc; diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java index f12d706..84ffd85 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java @@ -1,8 +1,23 @@ package com.biutag.supervision.pojo.param; +import lombok.Getter; +import lombok.Setter; + /** * @author wxc * @date 2024/10/15 */ +@Setter +@Getter public class DataCaseVerifQueryParam extends BasePage { + + private String originId; + + private String responderKey; + + private String responderValue; + + private String thingDesc; + + private String distributionState; } diff --git a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java b/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java index a95bc93..adaf85c 100644 --- a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java +++ b/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java @@ -1,28 +1,39 @@ package com.biutag.supervision.service; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.biutag.supervision.constants.enums.DataUpdateMethodEnum; +import com.biutag.supervision.constants.enums.DistributionStateEnum; +import com.biutag.supervision.constants.enums.HostLevelEnums; +import com.biutag.supervision.constants.enums.ProblemSourcesEnum; import com.biutag.supervision.mapper.DataCaseVerifMapper; import com.biutag.supervision.pojo.dto.DataCaseVerifImportDto; -import com.biutag.supervision.pojo.dto.DataPetitionComplaintAddDto; -import com.biutag.supervision.pojo.dto.DataPetitionComplaintImportDto; +import com.biutag.supervision.pojo.dto.DataCaseVerifDistribute; +import com.biutag.supervision.pojo.dto.NegativeDto; import com.biutag.supervision.pojo.entity.DataCaseVerif; -import com.biutag.supervision.pojo.entity.DataPetitionComplaint; import com.biutag.supervision.pojo.param.DataCaseVerifQueryParam; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.util.List; +@RequiredArgsConstructor @Service public class DataCaseVerifService extends ServiceImpl { + private final NegativeService negativeService; + public Page page(DataCaseVerifQueryParam queryParam) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.orderByDesc(DataCaseVerif::getCreateTime); + queryWrapper.like(StrUtil.isNotBlank(queryParam.getOriginId()), DataCaseVerif::getOriginId, queryParam.getOriginId()) + .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataCaseVerif::getThingDesc, queryParam.getThingDesc()) + .eq(StrUtil.isNotBlank(queryParam.getDistributionState()), DataCaseVerif::getDistributionState, queryParam.getDistributionState()) + .orderByDesc(DataCaseVerif::getCreateTime); return page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); } @@ -39,9 +50,49 @@ public class DataCaseVerifService extends ServiceImpl { + NegativeDto negativeDto = new NegativeDto(); + negativeDto.setOriginId(item.getOriginId()); + negativeDto.setHappenTime(item.getHappenTime()); + negativeDto.setDiscoveryTime(item.getDiscoveryTime()); + negativeDto.setProblemSourcesCode(ProblemSourcesEnum.A12389.getValue()); + negativeDto.setProblemSources(ProblemSourcesEnum.A12389.getLabel()); +// negativeDto.setBusinessTypeCode(BusinessTypeEnum.ABWW); +// negativeDto.setBusinessTypeName(); + negativeDto.setResponderName(item.getResponderName()); + negativeDto.setContactPhone(item.getResponderPhone()); + negativeDto.setThingDesc(item.getThingDesc()); + negativeDto.setInvolveDepartId(item.getInvolveDepartId()); + negativeDto.setInvolveDepartName(item.getInvolveDepartName()); + negativeDto.setHostLevel(HostLevelEnums.SECOND.getValue()); + + negativeDto.setApprovalFlow(dataDistribute.getApprovalFlow()); + negativeDto.setDepartId(item.getInvolveDepartId()); + negativeDto.setDepartName(item.getInvolveDepartName()); + negativeDto.setTimeLimit(dataDistribute.getTimeLimit()); + negativeDto.setMaxSignDuration(dataDistribute.getMaxSignDuration()); + negativeDto.setMaxHandleDuration(dataDistribute.getMaxHandleDuration()); + negativeDto.setMaxExtensionDuration(dataDistribute.getMaxExtensionDuration()); + negativeDto.setCaseNumber(item.getOriginId()); + negativeService.save(negativeDto); + update(new LambdaUpdateWrapper().eq(DataCaseVerif::getOriginId, item.getOriginId()) + .set(DataCaseVerif::getDistributionState, DistributionStateEnum.DISTRIBUTED.getValue())); + }); + return true; + } + } diff --git a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java index 21f90a1..98daafe 100644 --- a/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java +++ b/src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java @@ -3,23 +3,29 @@ package com.biutag.supervision.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.biutag.supervision.constants.enums.DataUpdateMethodEnum; +import com.biutag.supervision.constants.enums.DistributionStateEnum; +import com.biutag.supervision.constants.enums.HostLevelEnums; +import com.biutag.supervision.constants.enums.ProblemSourcesEnum; import com.biutag.supervision.mapper.DataPetitionComplaintMapper; -import com.biutag.supervision.pojo.dto.DataPetitionComplaintAddDto; -import com.biutag.supervision.pojo.dto.DataPetitionComplaintDto; -import com.biutag.supervision.pojo.dto.DataPetitionComplaintImportDto; +import com.biutag.supervision.pojo.dto.*; import com.biutag.supervision.pojo.entity.DataPetitionComplaint; import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +@RequiredArgsConstructor @Service public class DataPetitionComplaintService extends ServiceImpl { + private final NegativeService negativeService; + public Page page(DataPetitionComplaintQueryParam queryParam) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DataPetitionComplaint::getProblemSourcesCode, queryParam.getProblemSourcesCode()) @@ -61,12 +67,52 @@ public class DataPetitionComplaintService extends ServiceImpl { + NegativeDto negativeDto = new NegativeDto(); + negativeDto.setOriginId(item.getOriginId()); + negativeDto.setDiscoveryTime(item.getDiscoveryTime()); + negativeDto.setProblemSourcesCode(item.getProblemSourcesCode()); + negativeDto.setProblemSources(ProblemSourcesEnum.get(item.getProblemSourcesCode()).getLabel()); +// negativeDto.setBusinessTypeCode(BusinessTypeEnum.ABWW); +// negativeDto.setBusinessTypeName(); + negativeDto.setResponderName(item.getResponderName()); + negativeDto.setContactPhone(item.getResponderPhone()); + negativeDto.setThingDesc(item.getThingDesc()); + negativeDto.setInvolveDepartId(item.getInvolveDepartId()); + negativeDto.setInvolveDepartName(item.getInvolveDepartName()); + negativeDto.setHostLevel(HostLevelEnums.SECOND.getValue()); + + negativeDto.setApprovalFlow(dataDistribute.getApprovalFlow()); + negativeDto.setDepartId(item.getInvolveDepartId()); + negativeDto.setDepartName(item.getInvolveDepartName()); + negativeDto.setTimeLimit(dataDistribute.getTimeLimit()); + negativeDto.setMaxSignDuration(dataDistribute.getMaxSignDuration()); + negativeDto.setMaxHandleDuration(dataDistribute.getMaxHandleDuration()); + negativeDto.setMaxExtensionDuration(dataDistribute.getMaxExtensionDuration()); + negativeDto.setCaseNumber(item.getOriginId()); + negativeService.save(negativeDto); + update(new LambdaUpdateWrapper().eq(DataPetitionComplaint::getOriginId, item.getOriginId()) + .set(DataPetitionComplaint::getDistributionState, DistributionStateEnum.DISTRIBUTED.getValue())); + }); + return true; + } + } diff --git a/src/main/java/com/biutag/supervision/service/ModelClueService.java b/src/main/java/com/biutag/supervision/service/ModelClueService.java index 8426805..18d7c19 100644 --- a/src/main/java/com/biutag/supervision/service/ModelClueService.java +++ b/src/main/java/com/biutag/supervision/service/ModelClueService.java @@ -72,7 +72,7 @@ public class ModelClueService extends ServiceImpl { } public List listByUnDistributed(Integer modelId) { - return list(new LambdaQueryWrapper().eq(ModelClue::getModelId, modelId).eq(ModelClue::getDistributionState, ModelDistributionStateEnum.UNDISTRIBUTED.getValue())); + return list(new LambdaQueryWrapper().eq(ModelClue::getModelId, modelId).eq(ModelClue::getDistributionState, DistributionStateEnum.UNDISTRIBUTED.getValue())); } public boolean distribution(ModelClueTaskDistribute taskDistribute) { @@ -143,7 +143,7 @@ public class ModelClueService extends ServiceImpl { negativeService.save(negative); - item.setDistributionState(ModelDistributionStateEnum.DISTRIBUTED.getValue()); + item.setDistributionState(DistributionStateEnum.DISTRIBUTED.getValue()); item.setUpdateTime(LocalDateTime.now()); item.setNegativeId(negative.getId()); updateById(item); diff --git a/src/main/java/com/biutag/supervision/service/NegativeService.java b/src/main/java/com/biutag/supervision/service/NegativeService.java index eb0bda2..aa23628 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeService.java @@ -131,8 +131,10 @@ public class NegativeService extends ServiceImpl { public boolean save(NegativeDto negativeDto) { Negative negative = new Negative(); BeanUtil.copyProperties(negativeDto, negative); - String originId = generateOriginId(negativeDto.getProblemSourcesCode(), negativeDto.getBusinessTypeCode()); - negative.setOriginId(originId); + if (StrUtil.isBlank(negativeDto.getOriginId())) { + String originId = generateOriginId(negativeDto.getProblemSourcesCode(), negativeDto.getBusinessTypeCode()); + negative.setOriginId(originId); + } LocalDateTime now = LocalDateTime.now(); negative.setId(IdUtil.getSnowflakeNextIdStr()) .setProcessingStatus(ProcessingStatusEnum.signing.name())