From e467e83519ff95d851defad5a47e30659e5eeb0c Mon Sep 17 00:00:00 2001 From: ant Date: Fri, 19 Jul 2024 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B4=BE=E5=8D=95=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/work/po/WrkInfoDispatch.java | 7 +++--- .../work/service/WrkInfoDispatchService.java | 3 +++ .../work/service/WrkScheduleService.java | 8 ------- .../service/impl/WrkIcbcJsServiceImpl.java | 17 ++++---------- .../impl/WrkInfoDispatchServiceImpl.java | 23 +++++++++++++++++++ .../service/impl/WrkScheduleServiceImpl.java | 15 ------------ .../src/test/java/GenInsTest.java | 22 ++++++++++-------- 7 files changed, 46 insertions(+), 49 deletions(-) delete mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkScheduleService.java delete mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkScheduleServiceImpl.java diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoDispatch.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoDispatch.java index 67b25d0..7fe0433 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoDispatch.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoDispatch.java @@ -13,14 +13,12 @@ import lombok.*; */ @Data @EqualsAndHashCode(callSuper=true) -@AllArgsConstructor @NoArgsConstructor +@AllArgsConstructor @TableName(value = "wrk_info_dispatch") @Builder public class WrkInfoDispatch extends BaseEntity { - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - @TableField("wrk_id") + @TableId(value = "wrk_id", type = IdType.INPUT) private Long wrkId; @TableField("user_id") private Long userId; @@ -31,4 +29,5 @@ public class WrkInfoDispatch extends BaseEntity { */ @TableField("dis_status") private Integer disStatus; + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatchService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatchService.java index e585a6b..098edba 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatchService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoDispatchService.java @@ -3,9 +3,12 @@ package com.chushang.inspection.work.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.inspection.work.po.WrkInfoDispatch; +import java.util.ArrayList; + /** * @auther: zhao * @date: 2024/7/4 10:31 */ public interface WrkInfoDispatchService extends IService { + void updateWorkOrderProgress(Long userId, int disStatus, ArrayList wrkIds, Long deptId); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkScheduleService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkScheduleService.java deleted file mode 100644 index a2f986d..0000000 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkScheduleService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.chushang.inspection.work.service; - - -import java.util.Collection; - -public interface WrkScheduleService { - void updateWorkOrderProgress(int status, Collection list); -} 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 d50515b..6026a98 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 @@ -24,7 +24,7 @@ import com.chushang.inspection.work.dto.WrkIcbcJsReceive; import com.chushang.inspection.work.enums.BankBranchesEnum; import com.chushang.inspection.work.enums.WorkTypeOperation; import com.chushang.inspection.work.po.WrkInfo; -import com.chushang.inspection.work.service.WrkScheduleService; +import com.chushang.inspection.work.service.WrkInfoDispatchService; import com.chushang.inspection.work.service.WrkIcbcJsService; import com.chushang.inspection.work.service.WrkInfoService; import com.chushang.inspection.work.vo.BankDispatchDTO; @@ -60,7 +60,7 @@ public class WrkIcbcJsServiceImpl extends ServiceImpl> result = remoteUserService.getIdByNicknames(Set.of(), SecurityConstants.INNER); AssertUtil.invalidate(!result.isSuccess(), "获取业务员信息失败"); - wrkInfo = dispatchWrkInfo(dispatch, result.getData().get(task.getContact()), task.getContact(), WorkTypeOperation.valueOfCode(icbcJs.getOrderType())); + userId = result.getData().get(task.getContact()); + wrkInfo = dispatchWrkInfo(dispatch, userId, task.getContact(), WorkTypeOperation.valueOfCode(icbcJs.getOrderType())); } else { Result result = remoteUserService.getInfoById(userId, SecurityConstants.INNER); AssertUtil.invalidate(!result.isSuccess(), "获取业务员信息失败"); @@ -135,7 +136,7 @@ public class WrkIcbcJsServiceImpl extends ServiceImpl implements WrkInfoDispatchService { + @Override + @Transactional + public void updateWorkOrderProgress(Long userId, int disStatus, ArrayList wrkIds, Long deptId) { + // 修改 派单进度 + if (disStatus == 6) { + List schedules = StreamUtils.toList(wrkIds, wrkId -> new WrkInfoDispatch(wrkId,userId, deptId, 6)); + saveBatch(schedules); + } else { + // 修改派单 进度 + updateBatchById(StreamUtils.toList(wrkIds, wrkId-> { + WrkInfoDispatch wrkInfoDispatch = new WrkInfoDispatch(); + wrkInfoDispatch.setWrkId(wrkId); + wrkInfoDispatch.setDisStatus(disStatus); + return wrkInfoDispatch; + })); + } + } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkScheduleServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkScheduleServiceImpl.java deleted file mode 100644 index 0656eda..0000000 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkScheduleServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.chushang.inspection.work.service.impl; - -import com.chushang.inspection.work.service.WrkScheduleService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Collection; - -@Slf4j -@Service -public class WrkScheduleServiceImpl implements WrkScheduleService { - public void updateWorkOrderProgress(int status, Collection list){ - - } -} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/test/java/GenInsTest.java b/chushang-modules/chushang-module-inspection/inspection-service/src/test/java/GenInsTest.java index 0b816a6..3108db7 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/test/java/GenInsTest.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/test/java/GenInsTest.java @@ -1,14 +1,26 @@ +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.io.resource.ResourceUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chushang.InspectionApplication; +import com.chushang.common.core.util.FileUtils; import com.chushang.inspection.ins.GeneratedIns; import com.chushang.inspection.ins.TemplateService; +import com.chushang.inspection.work.po.WrkInfo; import com.chushang.inspection.work.service.WrkInfoService; +import com.deepoove.poi.XWPFTemplate; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.LoggerFactory; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; +import java.io.File; +import java.io.InputStream; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -20,21 +32,11 @@ import java.util.Map; @RunWith(SpringRunner.class) @SpringBootTest(classes = InspectionApplication.class) public class GenInsTest { - - @Resource - WrkInfoService wrkInfoService; - @Resource - TemplateService templateService; - @Test public void genTest(){ // generatedIns.generated(); - Map data = new HashMap<>(); - data.put("1", "1"); - data.put("2", "2"); - } }