From 8e19529ac1eb0843e0c3a0b76d35aa9ff6fe2032 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 13 一月 2025 17:46:35 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java | 14 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java | 13 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java | 12 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwWarehouseService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java | 66 +++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/WorkDeskDataResponse.java | 31 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java | 78 ++++++++++++-
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 14 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java | 24 ++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java | 65 ++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WorkbenchesService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java | 12 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwMaterialController.java | 1
13 files changed, 319 insertions(+), 17 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index 1feeb42..a3a456a 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -71,7 +71,7 @@
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
private Integer objId;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0=鐩樼偣涓氬姟 1=宸℃浠诲姟")
@ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷")
private Integer objType;
@@ -79,27 +79,27 @@
@ExcelColumn(name="鍏宠仈瀵硅薄鍚嶇О")
private String objName;
- @ApiModelProperty(value = "绫诲瀷 0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺")
- @ExcelColumn(name="绫诲瀷 0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺")
+ @ApiModelProperty(value = "绫诲瀷 0=鐩樼偣涓氬姟 1=宸℃浠诲姟")
+ @ExcelColumn(name="绫诲瀷 0=鐩樼偣涓氬姟 1=宸℃浠诲姟")
private Integer type;
@ApiModelProperty(value = "绫诲瀷鎻忚堪")
@TableField(exist = false)
private String typeDetail;
- @ApiModelProperty(value = "瀛樺偍 娑堟伅灞曠ずJSON" ,notes = "瀛樺偍 娑堟伅灞曠ずJSON ")
+ @ApiModelProperty(value = "鍏宠仈鍙傛暟1" ,notes = "鍏宠仈鍙傛暟1")
@ExcelColumn(name="鍏宠仈鍙傛暟1")
private String param1;
- @ApiModelProperty(value = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0 =寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�",notes = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0 =寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�")
+ @ApiModelProperty(value = "鍏宠仈鍙傛暟2",notes = "鍏宠仈鍙傛暟2")
@ExcelColumn(name="鍏宠仈鍙傛暟2")
private String param2;
- @ApiModelProperty(value = "鍙戣捣浜�",notes = "鍙戣捣浜�")
+ @ApiModelProperty(value = "鍏宠仈鍙傛暟3",notes = "鍏宠仈鍙傛暟3")
@ExcelColumn(name="鍏宠仈鍙傛暟3")
private String param3;
- @ApiModelProperty(value = "鎿嶄綔浜�")
+ @ApiModelProperty(value = "鍏宠仈鍙傛暟4")
@ExcelColumn(name="鍏宠仈鍙傛暟4")
private String param4;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwMaterialController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwMaterialController.java
index e9d3cf6..4470c79 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwMaterialController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwMaterialController.java
@@ -66,6 +66,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywmaterial:update")
public ApiResponse updateById(@RequestBody YwMaterial ywMaterial,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywMaterial.setLoginUserInfo(getLoginUser(token));
ywMaterialService.updateById(ywMaterial);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java
index b4d0c7e..885cfb3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWarehouseController.java
@@ -48,7 +48,7 @@
ywWarehouseService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
-//
+
// @ApiOperation("鎵归噺鍒犻櫎")
// @GetMapping("/delete/batch")
// @CloudRequiredPermission("business:ywwarehouse:delete")
@@ -66,10 +66,21 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywwarehouse:update")
public ApiResponse updateById(@RequestBody YwWarehouse ywWarehouse,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywWarehouse.setLoginUserInfo(getLoginUser(token));
ywWarehouseService.updateById(ywWarehouse);
return ApiResponse.success(null);
}
+ @ApiOperation("鏍规嵁ID淇敼鐘舵��")
+ @PostMapping("/updateStatusById")
+ @CloudRequiredPermission("business:ywwarehouse:update")
+ public ApiResponse updateStatusById(@RequestBody YwWarehouse ywWarehouse,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywWarehouse.setLoginUserInfo(getLoginUser(token));
+ ywWarehouseService.updateStatusById(ywWarehouse);
+ return ApiResponse.success(null);
+ }
+
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:ywwarehouse:query")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java
new file mode 100644
index 0000000..008e05e
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkDeskCloutController.java
@@ -0,0 +1,65 @@
+package com.doumee.cloud.admin;
+
+import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.YwPatrolTaskRecord;
+import com.doumee.dao.business.model.YwQuickModel;
+import com.doumee.dao.business.vo.MonthDataResponse;
+import com.doumee.dao.business.vo.WorkDeskDataResponse;
+import com.doumee.service.business.WorkbenchesService;
+import com.doumee.service.business.YwPatrolTaskRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/11/21 18:11
+ */
+@Api(tags = "宸ヤ綔鍙版暟鎹�")
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/ywWorkDesk")
+public class YwWorkDeskCloutController extends BaseController {
+
+ @Autowired
+ private WorkbenchesService workbenchesService;
+
+ @ApiOperation("鑾峰彇蹇嵎鑿滃崟妯″潡淇℃伅")
+ @GetMapping("/getYwQuickList")
+ public ApiResponse<List<YwQuickModel>> getYwQuickList(@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(workbenchesService.getYwQuickList(getLoginUser(token)));
+ }
+
+ @ApiOperation("鏇存柊蹇嵎妯″潡鏁版嵁")
+ @GetMapping("/updMyYwQuickModel")
+ public ApiResponse updMyYwQuickModel(@RequestBody List<Integer> idList,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ workbenchesService.updMyYwQuickModel(idList,getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("鑾峰彇鏃ョ▼鏁版嵁")
+ @GetMapping("/getMonthNotices")
+ public ApiResponse<List<MonthDataResponse>> getMonthNotices(@RequestParam String yearMonth, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(workbenchesService.getMonthNotices(yearMonth,getLoginUser(token)));
+ }
+
+ @ApiOperation("鑾峰彇寰呭姙鏁版嵁")
+ @GetMapping("/workDeskData")
+ public ApiResponse<WorkDeskDataResponse> workDeskData(@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(workbenchesService.workDeskData(getLoginUser(token)));
+ }
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/WorkDeskDataResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/WorkDeskDataResponse.java
new file mode 100644
index 0000000..4546e4b
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/WorkDeskDataResponse.java
@@ -0,0 +1,31 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.system.model.Notices;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/5/6 10:20
+ */
+@Data
+public class WorkDeskDataResponse {
+
+ @ApiModelProperty(value = "寰呭贰妫�鏁伴噺")
+ private Integer waitTaskSize;
+
+ @ApiModelProperty(value = "閫炬湡鏁伴噺")
+ private Integer timeOutSize;
+
+ @ApiModelProperty(value = "寰呭鐞嗗伐鍗曟暟閲�")
+ private long waitDealWorkOrderSize;
+
+ @ApiModelProperty(value = "寰呯洏鐐规暟閲�")
+ private long stocktakingSize;
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WorkbenchesService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WorkbenchesService.java
index a269203..02cbc28 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WorkbenchesService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WorkbenchesService.java
@@ -3,6 +3,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.business.model.YwQuickModel;
import com.doumee.dao.business.vo.MonthDataResponse;
+import com.doumee.dao.business.vo.WorkDeskDataResponse;
import java.util.List;
@@ -19,4 +20,7 @@
void updMyYwQuickModel(List<Integer> idList, LoginUserInfo loginUserInfo);
List<MonthDataResponse> getMonthNotices(String yearMonth, LoginUserInfo loginUserInfo);
+
+ WorkDeskDataResponse workDeskData(LoginUserInfo loginUserInfo);
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwWarehouseService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwWarehouseService.java
index 08f453e..b600f4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwWarehouseService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwWarehouseService.java
@@ -56,6 +56,8 @@
*/
void updateByIdInBatch(List<YwWarehouse> ywWarehouses);
+ void updateStatusById(YwWarehouse ywWarehouse);
+
/**
* 涓婚敭鏌ヨ
*
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java
index be82191..ef8aa92 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WorkbenchesServiceImpl.java
@@ -8,13 +8,16 @@
import com.doumee.core.model.LoginUserModel;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.business.ApproveParamMapper;
-import com.doumee.dao.business.PlatformLogMapper;
-import com.doumee.dao.business.YwQuickModelMapper;
-import com.doumee.dao.business.model.YwQuickModel;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.MonthDataResponse;
+import com.doumee.dao.business.vo.WorkDeskDataResponse;
+import com.doumee.dao.system.join.NoticesJoinMapper;
+import com.doumee.dao.system.model.Notices;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.WorkbenchesService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.jsonwebtoken.lang.Objects;
import io.swagger.models.auth.In;
import org.apache.tomcat.util.bcel.classfile.Constant;
@@ -37,6 +40,18 @@
@Autowired
private YwQuickModelMapper ywQuickModelMapper;
+
+ @Autowired
+ private YwWorkorderMapper ywWorkorderMapper;
+
+ @Autowired
+ private NoticesJoinMapper noticesJoinMapper;
+
+ @Autowired
+ private YwPatrolTaskMapper ywPatrolTaskMapper;
+
+ @Autowired
+ private YwStocktakingMapper ywStocktakingMapper;
@@ -92,19 +107,70 @@
public List<MonthDataResponse> getMonthNotices(String yearMonth, LoginUserInfo loginUserInfo){
List<String> dataList = DateUtil.getDayByMonth(yearMonth);
List<MonthDataResponse> monthDataResponseList = new ArrayList<>();
+ List<Notices> noticesList = noticesJoinMapper.selectList(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getUserId,loginUserInfo.getId())
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getStatus,Constants.ZERO)
+ );
for (String str:dataList) {
MonthDataResponse monthDataResponse = new MonthDataResponse();
monthDataResponse.setWeekMsg(DateUtil.getWeek(DateUtil.StringToDate(str,"yyyy-MM-dd")).getChineseName());
monthDataResponse.setMonthDate(str);
-
+ if(CollectionUtils.isNotEmpty(noticesList)){
+ monthDataResponse.setNoticeList(noticesList.stream().filter(i->i.getParam1().equals(str)).collect(Collectors.toList()));
+ }
monthDataResponseList.add(monthDataResponse);
}
return monthDataResponseList;
-
}
+ @Override
+ public WorkDeskDataResponse workDeskData(LoginUserInfo loginUserInfo){
+ WorkDeskDataResponse workDeskDataResponse = new WorkDeskDataResponse();
+ workDeskDataResponse.setWaitDealWorkOrderSize(Constants.ZERO);
+ workDeskDataResponse.setTimeOutSize(Constants.ZERO);
+ workDeskDataResponse.setStocktakingSize(Constants.ZERO);
+ workDeskDataResponse.setWaitTaskSize(Constants.ZERO);
+
+ List<YwPatrolTask> ywPatrolTaskList = ywPatrolTaskMapper.selectJoinList(YwPatrolTask.class,new MPJLambdaWrapper<YwPatrolTask>()
+ .selectAll(YwPatrolTask.class)
+ .selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode)
+ .selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle)
+ .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
+ .eq(YwPatrolTask::getIsdeleted, Constants.ZERO)
+ .eq(YwPatrolScheme::getStatus, Constants.ZERO)
+ .in(YwPatrolTask::getStatus, Constants.ZERO, Constants.ONE)
+ .le(YwPatrolTask::getEndDate,DateUtil.getCurrDateTime())
+ .apply(" find_in_set( "+loginUserInfo.getId()+" , t1.USER_IDS ) ")
+ );
+ Integer waitTaskSize = ywPatrolTaskList.size();
+ Integer timeOutSize = Constants.ZERO;
+ if(CollectionUtils.isNotEmpty(ywPatrolTaskList)){
+ timeOutSize = ywPatrolTaskList.stream().filter(i->(Constants.equalsInteger(i.getStatus(),Constants.ZERO) || Constants.equalsInteger(i.getStatus(),Constants.ONE) ) &&
+ i.getEndDate().getTime()<System.currentTimeMillis()).collect(Collectors.toList()).size();
+ }
+
+ long waitDealWorkOrderSize = ywWorkorderMapper.selectCount(new QueryWrapper<YwWorkorder>().lambda()
+ .eq(YwWorkorder::getIsdeleted, Constants.ZERO)
+ .eq(YwWorkorder::getStatus,Constants.ZERO)
+ .eq(YwWorkorder::getDealStatus,Constants.ONE)
+ .eq(YwWorkorder::getDealUserId,loginUserInfo.getId())
+ );
+
+ long stocktakingSize = ywStocktakingMapper.selectCount(new QueryWrapper<YwStocktaking>().lambda()
+ .eq(YwStocktaking::getIsdeleted,Constants.ZERO)
+ .eq(YwStocktaking::getUserId,loginUserInfo.getId())
+ .in(YwStocktaking::getStatus, Constants.ZERO, Constants.ONE)
+ );
+ workDeskDataResponse.setTimeOutSize(timeOutSize);
+ workDeskDataResponse.setWaitTaskSize(waitTaskSize);
+ workDeskDataResponse.setWaitDealWorkOrderSize(waitDealWorkOrderSize);
+ workDeskDataResponse.setStocktakingSize(stocktakingSize);
+ return workDeskDataResponse;
+ }
+
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java
index 22b0839..0b48d11 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java
@@ -59,7 +59,6 @@
//TODO rk 鎵�灞為」鐩�/鎴块棿闇�姹傞棶棰�
if(Objects.isNull(ywMaterial)
|| StringUtils.isBlank(ywMaterial.getName())
- || StringUtils.isBlank(ywMaterial.getCode())
|| StringUtils.isBlank(ywMaterial.getQrcode())
|| Objects.isNull(ywMaterial.getCateId())
){
@@ -190,7 +189,7 @@
Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey()));
if(Objects.nonNull(multifile)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_CONTRACT_BILL).getCode();
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode();
multifile.setFileurlFull(path + multifile.getFileurl());
ywMaterial.setMultifile(multifile);
}
@@ -227,7 +226,16 @@
.orderByAsc(YwMaterial::getCode)
;
- IPage iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper);
+ IPage<YwMaterial> iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper);
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode();
+ for (YwMaterial ywMaterial:iPage.getRecords()) {
+ Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,ywMaterial.getId()).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey()));
+ if(Objects.nonNull(multifile)){
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ ywMaterial.setMultifile(multifile);
+ }
+ }
return PageData.from(iPage);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
index 96a4593..6c64cf8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
@@ -16,6 +16,8 @@
import com.doumee.dao.business.YwPatrolTaskRecordMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.join.NoticesJoinMapper;
+import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwPatrolSchemeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -53,6 +55,8 @@
private SystemUserMapper systemUserMapper;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
+ @Autowired
+ private NoticesJoinMapper noticesJoinMapper;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -206,6 +210,26 @@
ywPatrolTaskRecordList.add(ywPatrolTaskRecord);
}
ywPatrolTaskRecordMapper.insert(ywPatrolTaskRecordList);
+
+ if(StringUtils.isNotBlank(ywPatrolScheme.getUserIds())){
+ String [] userIds = ywPatrolScheme.getUserIds().split(",");
+ for (String userId:userIds) {
+ //娣诲姞寰呭姙淇℃伅
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setCreator(ywPatrolScheme.getCreator());
+ notices.setIsdeleted(Constants.ZERO);
+ notices.setParam1(DateUtil.formatDate(ywPatrolTask.getStartDate(),"yyyy-MM-dd"));
+ notices.setTitle("宸℃浠诲姟寰呭姙");
+ notices.setContent("["+ywPatrolTask.getCode()+"]灏嗗湪["+notices.getParam1()+"]杩涜宸℃锛岃鎸夋椂鎵ц");
+ notices.setObjId(ywPatrolTask.getId());
+ notices.setObjType(Constants.ONE);
+ notices.setType(notices.getObjType());
+ notices.setUserId(Integer.valueOf(userId));
+ notices.setStatus(Constants.ZERO);
+ noticesJoinMapper.insert(notices);
+ }
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
index 4253d90..f78013f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
@@ -12,7 +12,9 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
+import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwPatrolTaskRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -58,6 +60,9 @@
@Autowired
private YwPatrolSchemeMapper ywPatrolSchemeMapper;
+
+ @Autowired
+ private NoticesJoinMapper noticesJoinMapper;
@Override
@@ -229,6 +234,13 @@
.set(YwPatrolTaskRecord::getDealInfo, ywPatrolTaskRecord.getDealInfo())
.eq(YwPatrolTaskRecord::getId,ywPatrolTaskRecord.getId()));
+ //鏍囪寰呭姙宸插鐞�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ONE)
+ .eq(Notices::getObjId,ywPatrolTask.getId())
+ );
if(ywPatrolTaskRecordMapper.selectCount(new QueryWrapper<YwPatrolTaskRecord>().lambda()
.eq(YwPatrolTaskRecord::getTaskId,ywPatrolTask.getId())
.eq(YwPatrolTaskRecord::getStatus,Constants.ZERO)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java
index cd0e102..b905879 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java
@@ -14,6 +14,8 @@
import com.doumee.dao.business.YwStocktakingRecordMapper;
import com.doumee.dao.business.YwWarehouseMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.join.NoticesJoinMapper;
+import com.doumee.dao.system.model.Notices;
import com.doumee.service.business.YwStocktakingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -56,6 +58,9 @@
private YwWarehouseMapper ywWarehouseMapper;
@Autowired
+ private NoticesJoinMapper noticesJoinMapper;
+
+ @Autowired
private RedisTemplate<String, Object> redisTemplate;
@Override
@@ -85,6 +90,20 @@
ywStocktaking.setStatus(Constants.ZERO);
ywStocktaking.setCode(getNextCode());
ywStocktakingMapper.insert(ywStocktaking);
+ //娣诲姞寰呭姙淇℃伅
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setCreator(ywStocktaking.getCreator());
+ notices.setIsdeleted(Constants.ZERO);
+ notices.setParam1(DateUtil.formatDate(ywStocktaking.getPlanDate(),"yyyy-MM-dd"));
+ notices.setTitle("鐩樼偣寰呭姙");
+ notices.setContent("["+ywStocktaking.getName()+"]灏嗗湪["+notices.getParam1()+"]杩涜鐩樼偣锛岃鎸夋椂鎵ц");
+ notices.setObjId(ywStocktaking.getId());
+ notices.setObjType(Constants.ZERO);
+ notices.setType(notices.getObjType());
+ notices.setUserId(ywStocktaking.getUserId());
+ notices.setStatus(Constants.ZERO);
+ noticesJoinMapper.insert(notices);
return ywStocktaking.getId();
}
@@ -101,6 +120,12 @@
.set(YwStocktaking::getEditDate,DateUtil.getCurrDateTime())
.set(YwStocktaking::getEditor,loginUserInfo.getId())
.eq(YwStocktaking::getId,id)
+ );
+ //鏍囪寰呭姙鍒犻櫎
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda().set(Notices::getIsdeleted,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,id)
);
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩樼偣鍗曠姸鎬佸凡娴佽浆锛屾棤娉曡繘琛岃鎿嶄綔");
@@ -121,6 +146,12 @@
.set(YwStocktaking::getCancelUserId,loginUserInfo.getId())
.set(YwStocktaking::getEditor,loginUserInfo.getId())
.set(YwStocktaking::getStatus,Constants.THREE).eq(YwStocktaking::getId,id));
+ //鏍囪寰呭姙鍒犻櫎
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda().set(Notices::getIsdeleted,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,id)
+ );
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩樼偣鍗曠姸鎬佸凡娴佽浆锛屾棤娉曡繘琛岃鎿嶄綔");
}
@@ -144,6 +175,15 @@
.set(YwStocktaking::getEditor,loginUserInfo.getId())
.set(YwStocktaking::getStatus,Constants.ONE)
.eq(YwStocktaking::getId,model.getId()));
+
+ //鏍囪寰呭姙宸插鐞�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,id)
+ );
+
//鐢熸垚褰撳墠浠撳簱涓嬫墍鏈夌殑璧勪骇淇℃伅
List<YwStock> stockList = ywStockMapper.selectList(new QueryWrapper<YwStock>().lambda().eq(YwStock::getIsdeleted,Constants.ZERO).eq(YwStock::getWarehouseId,model.getWarehouseId()));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(stockList)){
@@ -256,6 +296,32 @@
ywStocktaking.setEditDate(new Date());
ywStocktaking.setCode(null);
ywStocktakingMapper.updateById(ywStocktaking);
+
+
+ //鏍囪寰呭姙宸插鐞�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,ywStocktaking.getId())
+ );
+
+ //娣诲姞寰呭姙淇℃伅
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setCreator(ywStocktaking.getCreator());
+ notices.setIsdeleted(Constants.ZERO);
+ notices.setParam1(DateUtil.formatDate(ywStocktaking.getPlanDate(),"yyyy-MM-dd"));
+ notices.setTitle("鐩樼偣寰呭姙");
+ notices.setContent("["+ywStocktaking.getName()+"]灏嗗湪["+notices.getParam1()+"]杩涜鐩樼偣锛岃鎸夋椂鎵ц");
+ notices.setObjId(ywStocktaking.getId());
+ notices.setObjType(Constants.ZERO);
+ notices.setType(notices.getObjType());
+ notices.setUserId(ywStocktaking.getUserId());
+ notices.setStatus(Constants.ZERO);
+ noticesJoinMapper.insert(notices);
+
+
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java
index 35a70ea..c0281af 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWarehouseServiceImpl.java
@@ -120,6 +120,18 @@
}
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void updateStatusById(YwWarehouse ywWarehouse) {
+ if(Objects.isNull(ywWarehouse)
+ || Objects.isNull(ywWarehouse.getStatus())
+ || Objects.isNull(ywWarehouse.getId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ ywWarehouseMapper.update(new UpdateWrapper<YwWarehouse>().lambda().eq(YwWarehouse::getId,ywWarehouse.getId()).set(YwWarehouse::getStatus,ywWarehouse.getStatus()));
+ }
+
+ @Override
public void updateByIdInBatch(List<YwWarehouse> ywWarehouses) {
if (CollectionUtils.isEmpty(ywWarehouses)) {
return;
--
Gitblit v1.9.3