From a8e997e2609c87ed1d17227c5b76228f0dd8c33b Mon Sep 17 00:00:00 2001 From: ant Date: Mon, 29 Jul 2024 15:17:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=202.=20=E6=B1=9F=E8=8B=8F=E5=B7=A5=E8=A1=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mybatis/utils/WrapperUtils.java | 4 +- .../inspection/terminal/po/Store.java | 3 +- .../inspection/work/dto/DispatchDTO.java | 2 +- .../work/enums/BankBranchesEnum.java | 2 +- .../work/po/WrkInfoStoreRecord.java | 3 + .../work/po/WrkInfoTerminalRecord.java | 4 + .../inspection/work/query/WrkDataQuery.java | 23 ++++ .../inspection/work/vo/WrkDataVO.java | 48 +++++++++ .../controller/WrkProjectController.java | 2 +- .../controller/StoreImportController.java | 1 - .../terminal/service/StoreService.java | 3 +- .../terminal/service/TerminalService.java | 3 +- .../service/impl/FiveStoreServiceImpl.java | 1 - .../service/impl/StoreServiceImpl.java | 14 +-- .../service/impl/TerminalServiceImpl.java | 3 +- .../work/controller/WrkInfoController.java | 28 +++-- .../controller/WrkInfoPhoneController.java | 5 +- .../inspection/work/mapper/WrkInfoMapper.java | 9 ++ .../work/service/WrkInfoService.java | 9 +- .../service/impl/WrkIcbcJsServiceImpl.java | 12 +-- .../work/service/impl/WrkInfoServiceImpl.java | 102 +++++++++++++++--- .../main/resources/mapper/WrkInfoMapper.xml | 32 ++++++ .../system/remote/RemoteUserController.java | 11 -- .../system/service/ISysDictTypeService.java | 2 +- 24 files changed, 251 insertions(+), 75 deletions(-) create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkDataVO.java diff --git a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java index 68bcf90..0840134 100644 --- a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java +++ b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java @@ -42,8 +42,8 @@ public class WrapperUtils { if (ObjectUtil.isEmpty(value)) { continue; } - // 检查 值是否包含关键字 - SqlUtil.filterKeyword(String.valueOf(value)); + // 检查 值是否包含关键字 不做关键字检查 +// SqlUtil.filterKeyword(String.valueOf(value)); String name = condition.name(); String tableName = condition.tableName(); String[] split = name.split(","); diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java index bd02235..7ed0f5a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.chushang.common.mybatis.base.BaseEntity; import java.time.LocalDateTime; -import java.util.Date; import com.chushang.inspection.terminal.enums.MerTypeOperation; import com.chushang.inspection.work.dto.WrkIcbcJsReceive; @@ -170,7 +169,7 @@ public class Store extends BaseEntity { @TableField(value = "project_id") private Long projectId; - public Store save(WrkIcbcJsReceive dto) { + public Store saveJcIcbc(WrkIcbcJsReceive dto) { this.storeNo = dto.getMerId(); this.storeName = dto.getMerName(); this.storeContact = dto.getLinkName(); diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/DispatchDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/DispatchDTO.java index fb7860d..a83c7aa 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/DispatchDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/DispatchDTO.java @@ -185,7 +185,7 @@ public class DispatchDTO implements Serializable { */ protected LocalDateTime createTime; - public DispatchDTO dispatch(WrkIcbcJs entity) { + public DispatchDTO dispatchJcIcbc(WrkIcbcJs entity) { this.terminalId = entity.getTerminalId(); // todo 此处应当为 江苏工行的部门id this.deptId = 200L; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/enums/BankBranchesEnum.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/enums/BankBranchesEnum.java index 627079b..b563f1c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/enums/BankBranchesEnum.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/enums/BankBranchesEnum.java @@ -4,7 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * TODO 此处需要改下 对应的本级任务id + * TODO 此处需要改下 对应的本级任务id 江苏工行 */ @Getter @AllArgsConstructor diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java index cdeabf1..f191649 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java @@ -151,4 +151,7 @@ public class WrkInfoStoreRecord extends BaseEntity { */ @TableField(value = "state") private Integer state; + + @TableField(value = "project_id") + private Long projectId; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java index 6c83236..d623ae3 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java @@ -106,4 +106,8 @@ public class WrkInfoTerminalRecord extends BaseEntity { */ @TableField(value = "remark") private String remark; + + + @TableField(value = "project_id") + private Long projectId; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java new file mode 100644 index 0000000..4d8cfc1 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java @@ -0,0 +1,23 @@ +package com.chushang.inspection.work.query; + +import com.chushang.common.mybatis.annotation.Condition; +import com.chushang.common.mybatis.page.CommonParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.time.LocalDateTime; +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +public class WrkDataQuery extends CommonParam { + @Condition(name = "project_name", tableName = "p", type = Condition.ConditionType.like) + private String projectName; + @Condition(name = "name", tableName = "pt", type = Condition.ConditionType.like) + private String taskName; + @Condition(name = "dept_id", tableName = "wi") + private Long deptId; + @Condition(name = "dispose_time", tableName = "wi", type = Condition.ConditionType.in) + private List disposeTimes; + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkDataVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkDataVO.java new file mode 100644 index 0000000..498b73e --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkDataVO.java @@ -0,0 +1,48 @@ +package com.chushang.inspection.work.vo; + +import lombok.Data; + +@Data +public class WrkDataVO { + /** + * 项目id + */ + private Long projectId; + /** + * 项目名称 + */ + private String projectName; + /** + * 部门id + */ + private Long deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 任务id + */ + private Long taskId; + /** + * 任务名称 + */ + private String taskName; + /** + * 终端数 + */ + private Integer totalTer; + /** + * 工单数 + */ + private Integer totalWrk; + /** + * 完成数 + */ + private Integer totalSuc; + /** + * 超时 + */ + private Integer totalTimeOut; + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java index 092f303..51f0d8e 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -185,7 +185,7 @@ public class WrkProjectController { */ @SysLog(value = "项目数据", businessType = BusinessType.EXPORT) @GetMapping(value = "/project/data/export") -// @RequiresPermissions("inspection:project:export") + @RequiresPermissions("inspection:project:export") public AjaxResult projectDataExport(ProjectQuery projectQuery) { return AjaxResult.success("项目数据导出成功, 请在后台任务中查看, 任务id: ["+ projectService.projectDataExport(projectQuery) +"]"); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java index 3eb5e3a..f8183d0 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreImportController.java @@ -45,7 +45,6 @@ public class StoreImportController { StoreImportService storeImportService; /** - * todo * 需要 以下接口 * 1. 导入列表页查询 * 2. 导出修改 diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java index c473742..c114e3d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java @@ -3,7 +3,6 @@ package com.chushang.inspection.terminal.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.mybatis.utils.PageResult; -import com.chushang.inspection.project.po.Template; import com.chushang.inspection.project.vo.CountVO; import com.chushang.inspection.terminal.po.Store; import com.chushang.inspection.terminal.query.StoreQuery; @@ -26,7 +25,7 @@ public interface StoreService extends IService{ void upload(MultipartFile file, Long taskId); - Store save(WrkIcbcJsReceive dto); + Store saveJcIcbc(WrkIcbcJsReceive dto); List countByProjectIds(Set projectIds); default Map countByProjectIdsMap(Set projectIds){ diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java index bbc758c..70b6f14 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java @@ -14,6 +14,7 @@ import com.chushang.inspection.work.dto.DispatchDTO; import com.chushang.inspection.work.dto.WrkIcbcJsReceive; import com.chushang.inspection.work.query.DispatchQuery; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; @@ -56,7 +57,7 @@ public interface TerminalService extends IService{ * @param i * @return */ - void updateOccupy(List terminalIds, int i); + void updateOccupy(Collection terminalIds, int i); /** * 查询终端商户巡检信息 diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java index de0f180..2e314cc 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java @@ -97,7 +97,6 @@ public class FiveStoreServiceImpl extends ServiceImpl implements * @return */ @Override - public Store save(WrkIcbcJsReceive dto) { + public Store saveJcIcbc(WrkIcbcJsReceive dto) { Store store = getOne(new LambdaQueryWrapper() .eq(Store::getTaskId, "") .eq(Store::getStoreNo, dto.getMerId()) ); if (store == null) { - store = new Store().save(dto); + store = new Store().saveJcIcbc(dto); save(store); } return store; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java index c1e0c2f..ba9c482 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java @@ -46,6 +46,7 @@ import com.chushang.inspection.terminal.mapper.TerminalMapper; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; @@ -122,7 +123,7 @@ public class TerminalServiceImpl extends ServiceImpl i } @Override - public void updateOccupy(List terminalIds, int i) { + public void updateOccupy(Collection terminalIds, int i) { for (Long terminalId : terminalIds) { Terminal terminal = getById(terminalId); terminal.setOccupy(i); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java index ec7dfe0..eb2b0bd 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java @@ -8,10 +8,7 @@ import com.chushang.common.log.enums.BusinessType; import com.chushang.inspection.project.dto.Delete; import com.chushang.inspection.utils.TaskConfigUtils; import com.chushang.inspection.work.dto.WrkInfoDTO; -import com.chushang.inspection.work.query.DispatchQuery; -import com.chushang.inspection.work.query.ReviewedQuery; -import com.chushang.inspection.work.query.WrkAppQuery; -import com.chushang.inspection.work.query.WrkInfoQuery; +import com.chushang.inspection.work.query.*; import com.chushang.inspection.work.service.WrkInfoService; import com.chushang.security.annotation.RequiresPermissions; import com.google.common.collect.Lists; @@ -42,7 +39,6 @@ public class WrkInfoController { /** * 导出 - * todo */ @SysLog(value = "导出列表", businessType = BusinessType.EXPORT) @GetMapping("/exportDispatchPage") @@ -55,7 +51,6 @@ public class WrkInfoController { /** * 查询派单/领取列表 --> 查询派单领取 - * todo */ @SysLog(value = "派单/领取列表", businessType = BusinessType.QUERY) @GetMapping("/dispatch/page") @@ -241,10 +236,25 @@ public class WrkInfoController { return AjaxResult.success(); } + /** + * 工单数据 + */ @GetMapping(value = "/data") - @RequiresPermissions("wrk:info:dispatch") - public AjaxResult wrkData(){ - return AjaxResult.success(); +// @RequiresPermissions("wrk:info:data") + public AjaxResult wrkData(WrkDataQuery wrkDataQuery) + { + return AjaxResult.success(wrkInfoService.wrkData(wrkDataQuery)); + } + + /** + * 工单数据导出 + * @param wrkDataQuery 查询条件 + */ + @GetMapping(value = "/data/export") + @RequiresPermissions("wrk:data:export") + public AjaxResult wrkDataExport(WrkDataQuery wrkDataQuery) + { + return AjaxResult.success("工单数据导出成功, 请在后台任务中查看, 任务id: ["+ wrkInfoService.wrkDataExport(wrkDataQuery) +"]"); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoPhoneController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoPhoneController.java index 74e9c97..aeed186 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoPhoneController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoPhoneController.java @@ -73,12 +73,11 @@ public class WrkInfoPhoneController { } /** - * todo * 单条修改 */ @SysLog(value = "电话工单", businessType = BusinessType.UPDATE) @PostMapping(value = "/update/{wrkId}") - @RequiresPermissions("wrk:phone:save") + @RequiresPermissions("wrk:phone:update") public AjaxResult delInfo(@RequestBody WrkInfoPhoneImportDTO info, @PathVariable Long wrkId) { @@ -90,7 +89,7 @@ public class WrkInfoPhoneController { */ @SysLog(value = "电话工单", businessType = BusinessType.DELETE) @DeleteMapping(value = "/del/{wrkId}") - @RequiresPermissions("wrk:phone:save") + @RequiresPermissions("wrk:phone:del") public AjaxResult delInfo(@PathVariable Long wrkId) { return AjaxResult.success(infoPhoneService.removeById(wrkId)); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java index 9aefe50..bf14221 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java @@ -7,6 +7,7 @@ import com.chushang.inspection.project.vo.CountVO; import com.chushang.inspection.work.po.WrkInfo; import com.chushang.inspection.work.query.ReviewedQuery; import com.chushang.inspection.work.query.WrkAppQuery; +import com.chushang.inspection.work.query.WrkDataQuery; import com.chushang.inspection.work.query.WrkInfoQuery; import com.chushang.inspection.work.vo.*; import org.apache.ibatis.annotations.Param; @@ -37,4 +38,12 @@ public interface WrkInfoMapper extends BaseMapper { List countByProjectIds(@Param("projectIds") Set projectIds, @Param("wrkTypes") Set wrkTypes); + + /** + * 工单数据 + * @param wrkDataQuery query + * @param page 分页 + */ + + List wrkData(@Param("query") WrkDataQuery wrkDataQuery, Page page); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java index 0eab1fe..f0afe82 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java @@ -10,10 +10,7 @@ import com.chushang.inspection.terminal.po.TerminalIns; import com.chushang.inspection.work.dto.WrkInfoDTO; import com.chushang.inspection.work.po.WrkInfo; import com.baomidou.mybatisplus.extension.service.IService; -import com.chushang.inspection.work.query.DispatchQuery; -import com.chushang.inspection.work.query.ReviewedQuery; -import com.chushang.inspection.work.query.WrkAppQuery; -import com.chushang.inspection.work.query.WrkInfoQuery; +import com.chushang.inspection.work.query.*; import com.chushang.inspection.work.vo.WrkInfoDetailsVO; import javax.servlet.http.HttpServletResponse; @@ -64,4 +61,8 @@ public interface WrkInfoService extends IService { } return Map.of(); } + + PageResult wrkData(WrkDataQuery wrkDataQuery); + + Long wrkDataExport(WrkDataQuery wrkDataQuery); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkIcbcJsServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkIcbcJsServiceImpl.java index c67e227..7cdbe25 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkIcbcJsServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkIcbcJsServiceImpl.java @@ -9,11 +9,8 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chushang.common.core.constant.SecurityConstants; import com.chushang.common.core.exception.utils.AssertUtil; @@ -23,7 +20,6 @@ import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.datascope.annotation.DataScope; import com.chushang.inspection.project.po.PollingTask; -import com.chushang.inspection.project.po.WrkProjectPayment; import com.chushang.inspection.project.service.PollingTaskService; import com.chushang.inspection.terminal.po.Store; import com.chushang.inspection.terminal.po.Terminal; @@ -93,7 +89,7 @@ public class WrkIcbcJsServiceImpl extends ServiceImpl impl private final RemoteUserService userFeignService; private final RemoteDeptService remoteDeptService; private final DispatchRecordService dispatchRecordService; + private final RemoteOssService remoteOssService; @Value("${push.icbc-js.enable:false}") private boolean enable; @@ -360,10 +367,11 @@ public class WrkInfoServiceImpl extends ServiceImpl impl tempStorageTerminalRecord.setWrkId(wrkInfo.getWrkId()); tempStorageTerminalInsRecord.setWrkId(wrkInfo.getWrkId()); LocalDateTime now = LocalDateTime.now(); + // 工单状态 + tempStorageWrkInfo.setWrkStatus(info.getWrkStatus()); + tempStorageWrkInfo.setDisposeTime(now); // 工单状态比较 -- 7应该是暂存 if (info.getWrkStatus() != 9) { - tempStorageWrkInfo.setWrkStatus(info.getWrkStatus()); - tempStorageWrkInfo.setDisposeTime(now); // // 修改 工单信息 // updateById(tempStorageWrkInfo); // // 修改 商户信息 @@ -457,18 +465,22 @@ public class WrkInfoServiceImpl extends ServiceImpl impl List list = list(queryWrapper); Assert.notEmpty(list, "请确认此工单是否存在或已经审核成功了"); List wrkIds = list.stream().map(WrkInfo::getWrkId).collect(Collectors.toList()); + removeBatchByIds(wrkIds); wrkImgService.remove(new LambdaQueryWrapper().in(WrkImg::getWrkId, wrkIds)); inspectionDataService.remove(new LambdaQueryWrapper().in(InspectionData::getInsId, wrkIds)); - // todo 终端占用状态和江西内蒙古 wrkInfoStoreRecordService.removeBatchByIds(wrkIds); // 修改 终端信息 wrkInfoTerminalRecordService.removeBatchByIds(wrkIds); // 修改 终端对应巡检信息 wrkInfoTerminalInsRecordService.removeBatchByIds(wrkIds); - - // todo 解除终端的占用 - // todo 江苏工行, 建行内蒙古的撤回 + // 终端数据 + List wrkInfoTerminalRecords = wrkInfoTerminalRecordService.listByIds(wrkIds); + Set terminalIds = wrkInfoTerminalRecords.stream().map(WrkInfoTerminalRecord::getTerminalId) + .collect(Collectors.toSet()); + // 解除终端占用 --> 原本会删除业务员录入 终端以及商户信息, 这里不删除, 只修改终端占用 + terminalService.updateOccupy(terminalIds, 0); + // 建行内蒙古的撤回 本身需要删除五统一商户信息, 此处不删除 } @@ -486,8 +498,8 @@ public class WrkInfoServiceImpl extends ServiceImpl impl * 6. 复审驳回 * 7. 初审通过 * 8. 默认审核通过 - * todo 当任务为只需要初审时, 点击初审通过, 则其状态由2 变为 7 - * todo 当任务需要复审时, 点击初审通过, 其状态由2 变为3 + * 当任务为只需要初审时, 点击初审通过, 则其状态由2 变为 7 + * 当任务需要复审时, 点击初审通过, 其状态由2 变为3 * 当任务不需要审核时, 点击提交, 工单状态, 由1 变为8 */ @Override @@ -669,6 +681,72 @@ public class WrkInfoServiceImpl extends ServiceImpl impl return baseMapper.countByProjectIds(projectIds, wrkType); } + @Override + @DataScope(deptAlias = "wi") + public PageResult wrkData(WrkDataQuery wrkDataQuery) { + CommonParam commonParam = CommonParam.buildPageRequest(); + WrapperUtils.buildSql(wrkDataQuery); + Page page = new Page<>(commonParam.getPage(), commonParam.getLimit()); + List records = baseMapper.wrkData(wrkDataQuery, page); + return new PageResult(records, page); + } + + /** + * 工单数据导出 + */ + @Override + public Long wrkDataExport(WrkDataQuery wrkDataQuery) { + CommonParam commonParam = CommonParam.buildPageRequest(); + WrapperUtils.buildSql(wrkDataQuery); + Page page = new Page<>(commonParam.getPage(), commonParam.getLimit()); + List records = baseMapper.wrkData(wrkDataQuery, page); + AssertUtil.invalidate (records.size() <= 0, "导出数据为空"); + return remoteTaskService.createTask(CreateTaskDTO.builder() + .params(JSON.toJSONString(wrkDataQuery)) + .taskName("工单数据导出") + .applicationName(ServiceEnum.INSPECTION) + .methodName("exportWrkData") + .className(this.getClass().getName()) + .deptId(SecurityUtils.getDeptId()) + .taskType(TaskTypeEnum.DOWN) + .remark("五统一商户明细导出") + .createBy(SecurityUtils.getUsername()) + .build(), SecurityConstants.INNER).getData(); + } + + /** + * 导出工单数据 + * @param params 所需参数 + */ + public Result exportWrkData(String params) + { + WrkDataQuery projectQuery = JSON.parseObject(params, WrkDataQuery.class); + WrapperUtils.buildSql(projectQuery); + List list = baseMapper.wrkData(projectQuery, null); + try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()){ + // 如果为空时 创建一个空excel + if (CollectionUtil.isEmpty(list)){ + }else { + ExcelUtils.exportList(outputStream, WrkDataVO.class, list, "工单数据"); + } + // 上传到oss fileStore 是五统一的商户文件 + Result> listResult = remoteOssService.uploadBytes(UploadBytesDTO.builder() + .bytes(outputStream.toByteArray()).build(), "工单数据导出.xlsx", false, "", "wrkData", SecurityConstants.INNER); + + if (listResult.isSuccess() && CollectionUtil.isNotEmpty(listResult.getData())){ + List data = listResult.getData(); + FileSourceVo fileSourceVo = data.get(0); + String filePath = fileSourceVo.getFilePath(); + return Result.ok(filePath); + }else { + log.error("生成文件异常, {}, {}", listResult.getCode(), listResult.getMsg()); + return Result.failed(listResult.getCode(), listResult.getMsg()); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + /** * 计算经纬度 偏差 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml index 47e37e3..c4bac25 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml @@ -268,4 +268,36 @@ GROUP BY wi.project_id + + diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java index 31ae301..d0bade2 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java @@ -52,19 +52,8 @@ public class RemoteUserController implements RemoteUserService { sysUserVo.setRoles(roles); sysUserVo.setScopes(dataScopes); sysUserVo.setPermissions(permissions); - // todo 用户拥有的数据权限 -// List userDataList = userDataService.listUserData(sysUser); // 默认传递一个空Map --> 拥有管理员 sysUserVo.setAuthDataMap(new HashMap<>()); -// if (CollectionUtil.isNotEmpty(userDataList)){ -// Map> authDataMap = new HashMap<>(); -// // 对应的数据权限 -// for (SysUserData sysUserData : userDataList) { -// authDataMap.put(sysUserData.getDataType().getCodeType(), -// new HashSet<>(JSONUtil.toList(sysUserData.getDataValue(), String.class))); -// } -// sysUserVo.setAuthDataMap(authDataMap); -// } return Result.ok(sysUserVo); } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java index 71d071b..edea2f3 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDictTypeService.java @@ -33,7 +33,7 @@ public interface ISysDictTypeService extends IService { default boolean checkDictTypeUnique(SysDictType dictType, CommonParam commonParam){ return this.count(buildWrapper(dictType, commonParam)) > 0; } - // todo + // todo 字典缓存刷新 default void resetDictCache(){} }