巡检报修中添加申领物料

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -16,9 +16,11 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.business.enums.MaintenanceStatusEnum;
 import org.springblade.modules.business.pojo.dto.MaintenanceTaskDto;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
+import org.springblade.modules.business.service.IMaintenanceApplyGoodsService;
 import org.springblade.modules.business.service.IMaintenancePlanService;
 import org.springblade.modules.business.service.IMaintenanceTaskDetailService;
 import org.springblade.modules.business.service.IMaintenanceTaskService;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 维保控制器
@@ -45,7 +48,7 @@ public class MaintenanceController extends BladeController {
 
     private final IMaintenanceTaskService taskService;
     private final IMaintenanceTaskDetailService taskDetailService;
-
+    private final IMaintenanceApplyGoodsService maintenanceApplyGoodsService;
     private final SmsService smsService;
 
     /*---------- 维修计划开始 ----------*/
@@ -250,10 +253,18 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_CREATE.getValue());
         taskService.updateById(taskOld);
-
         List<MaintenanceTaskDetail> detailList = taskDto.getDetailList();
-        taskDetailService.saveOrUpdateBatch(detailList);
+        for (MaintenanceTaskDetail maintenanceTaskDetail : detailList) {
-
+            Optional<List<MaintenanceTaskDetailGoods>> detailGoods = Optional.ofNullable(maintenanceTaskDetail.getDetailGoodsList());
+            if (detailGoods.isPresent()) {
+                List<MaintenanceTaskDetailGoods> detailGoodsList = detailGoods.get();
+                for (MaintenanceTaskDetailGoods maintenanceTaskDetailGoods : detailGoodsList) {
+                    maintenanceApplyGoodsService.save(maintenanceTaskDetailGoods);
+                }
+            } else {
+                taskDetailService.saveOrUpdate(maintenanceTaskDetail);
+            }
+        }
         return R.success();
     }
 
@@ -263,7 +274,6 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_SUBMIT.getValue());
         taskService.updateById(taskOld);
-
         return R.success();
     }
 

src/main/java/org/springblade/modules/business/contraller/MessageController.java

@@ -6,14 +6,9 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.modules.business.pojo.dto.MessageUpdateDTO;
-import org.springblade.modules.business.pojo.entity.Message;
-import org.springblade.modules.business.pojo.vo.MessageVO;
 import org.springblade.modules.business.service.IMessageService;
 import org.springframework.web.bind.annotation.*;
-
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @RestController
 @AllArgsConstructor
@@ -77,14 +72,5 @@ public class MessageController extends BladeController {
         return R.success();
     }
 
-    @PostMapping("/saveMessage")
-    public void saveMessage(@RequestBody Message message) {
-        String content = message.getContent();
-        String title = message.getTitle();
-        String systemType = message.getSystemType();
-        Long messageUser = message.getMessageUser();
-        Integer messageType = message.getMessageType();
-        messageService.saveMessage(systemType, title, content, messageUser, messageType);
-    }
 
 }

src/main/java/org/springblade/modules/business/mapper/MaintenanceApplyGoodsMapper.java

@@ -0,0 +1,9 @@
+package org.springblade.modules.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
+
+@Mapper
+public interface MaintenanceApplyGoodsMapper extends BaseMapper<MaintenanceTaskDetailGoods> {
+}

src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java

@@ -0,0 +1,39 @@
+package org.springblade.modules.business.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.poi.hpsf.Decimal;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
+
+@Data
+@TableName("lab_maintenance_task_detail_applygoods")
+@EqualsAndHashCode(callSuper = true)
+public class MaintenanceTaskDetailGoods extends BaseEntity {
+
+    //物料名称
+    private String goodsName;
+
+    //库存id
+    private Long warehouseId;
+
+    //规格
+    private String rule;
+
+    //型号
+    private String xh;
+
+    //数量
+    private Integer number;
+
+    //单位
+    private String unit;
+
+    //价格
+    private Double price;
+
+    private Long parentId;
+
+
+}

src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTaskDetail.java

@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -23,84 +24,94 @@ import java.util.List;
 @Schema(description = "维保任务详细")
 public class MaintenanceTaskDetail extends BaseEntity {
 
-	private Long taskId;
+    private Long taskId;
-
+
-	/**
+    /**
-	 * 设备id
+     * 设备id
-	 */
+     */
-	private Long deviceId;
+    private Long deviceId;
-	/**
+    /**
-	 * 设备名称
+     * 设备名称
-	 */
+     */
-	private String deviceName;
+    private String deviceName;
-
+
-	/**
+    /**
-	 * 楼层
+     * 楼层
-	 */
+     */
-	private String floorName;
+    private String floorName;
-
+
-	/**
+    /**
-	 * 房间
+     * 房间
-	 */
+     */
-	private Long deptId;
+    private Long deptId;
-
+
-	/**
+    /**
-	 * 房间名称
+     * 房间名称
-	 */
+     */
-	private String deptName;
+    private String deptName;
-
+
-	/**
+    /**
-	 * 专业名称
+     * 专业名称
-	 */
+     */
-	private String majorName;
+    private String majorName;
-
+
-	/**
+    /**
-	 * 巡检内容
+     * 巡检内容
-	 */
+     */
-	private String checkContent;
+    private String checkContent;
-
+
-	/**
+    /**
-	 * 工艺要求
+     * 工艺要求
-	 */
+     */
-	private String craft;
+    private String craft;
-
+
-	/**
+    /**
-	 * 巡检周期 1:月， 2：季， 3：半年
+     * 巡检周期 1:月， 2：季， 3：半年
-	 */
+     */
-	private Integer period;
+    private Integer period;
-
+
-	/**
+    /**
-	 * 现场图片地址
+     * 现场图片地址
-	 */
+     */
-	private String picUrl;
+    private String picUrl;
-
+
-	/**
+    /**
-	 * 签字图片地址
+     * 签字图片地址
-	 */
+     */
-	private String signUrl;
+    private String signUrl;
-
+
-	/**
+    /**
-	 * 备注
+     * 备注
-	 */
+     */
-	private String remark;
+    private String remark;
-
+
-	/**
+    /**
-	 * 维修价格
+     * 维修价格
-	 */
+     */
-	private Double price;
+    private Double price;
-
+
-	/**
+    /**
-	 * 客户确认是否维修, 0:不维修， 1维修
+     * 客户确认是否维修, 0:不维修， 1维修
-	 */
+     */
-	private Integer isRepair;
+    private Integer isRepair;
-
+
-	/**
+    /**
-	 * 计划开始时间
+     * 确认是否需要物资
-	 */
+     */
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Integer isNeed;
-	@JsonFormat(pattern = "yyyy-MM-dd")
+
-	private Date startTime;
+    /**
-
+     * 计划开始时间
-	@TableField(exist = false)
+     */
-	private List<MaintenanceTaskDetail> details;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @TableField(exist = false)
+    private List<MaintenanceTaskDetail> details;
+
+    //物资申领列表
+    @TableField(exist = false)
+    private List<MaintenanceTaskDetailGoods> detailGoodsList;
+
 }

src/main/java/org/springblade/modules/business/service/IMaintenanceApplyGoodsService.java

@@ -0,0 +1,9 @@
+package org.springblade.modules.business.service;
+
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
+
+public interface IMaintenanceApplyGoodsService extends BaseService<MaintenanceTaskDetailGoods> {
+
+}

src/main/java/org/springblade/modules/business/service/IMessageService.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface IMessageService extends BaseService<Message> {
 
-    void saveMessage(String systemType, String title, String content, Long messageUser, Integer messageType);
+    void saveMessage(String title, String content, Long messageUser, Integer messageType);
 
 
     PageVO getMessageList(Integer current, Integer size, LocalDate start, LocalDate end, Integer status);

src/main/java/org/springblade/modules/business/service/impl/MaintenanceApplyGoodsServiceImpl.java

@@ -0,0 +1,11 @@
+package org.springblade.modules.business.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.business.mapper.MaintenanceApplyGoodsMapper;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
+import org.springblade.modules.business.service.IMaintenanceApplyGoodsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MaintenanceApplyGoodsServiceImpl extends BaseServiceImpl<MaintenanceApplyGoodsMapper, MaintenanceTaskDetailGoods> implements IMaintenanceApplyGoodsService {
+}

src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java

@@ -4,6 +4,7 @@ package org.springblade.modules.business.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
+import org.springblade.common.cache.UserCache;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -15,6 +16,8 @@ import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlanD
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
 import org.springblade.modules.business.service.*;
+import org.springblade.modules.business.sms.SmsService;
+import org.springblade.modules.resource.pojo.entity.Sms;
 import org.springblade.modules.system.pojo.entity.User;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
@@ -46,6 +49,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
     private final IMaintenanceTaskDetailService taskDetailService;
     private final IDeviceAttachService deviceAttachService;
     private final IUserService userService;
+    private final SmsService smsService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -239,6 +243,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         String todayStr = format.format(new Date());
         int count = 1;
+        int taskCount = 0;
         for (Map.Entry<Long, List<MaintenancePlanDetail>> longListEntry : listMap.entrySet()) {
             Long planId = longListEntry.getKey();
             List<MaintenancePlanDetail> details = longListEntry.getValue();
@@ -274,12 +279,24 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
                         // 修改计划详情
                         planDetailService.updateBatchById(newDetails);
                         count++;
+                        taskCount++;
                     } catch (Exception e) {
                         log.error(e.toString());
                     }
                 }
             }
         }
+        if (taskCount > 0) {
+            String roleId = "1839537055389515777";
+            List<User> maintenanceSupervisorList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, roleId));
+            try {
+                for (User maintenanceSupervisor : maintenanceSupervisorList) {
+                    smsService.sendSms(maintenanceSupervisor.getPhone(), maintenanceSupervisor.getRealName());
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
         return true;
     }
 

src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java

@@ -12,9 +12,11 @@ import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.modules.business.excel.MaintenanceTaskDetailExcel;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
 import org.springblade.modules.business.pojo.vo.MaintenanceTaskDetailVO;
 import org.springblade.modules.business.pojo.vo.MaintenanceTaskVO;
 import org.springblade.modules.business.pojo.vo.SearchMaintenancePersonnelVO;
+import org.springblade.modules.business.service.IMaintenanceApplyGoodsService;
 import org.springblade.modules.business.service.IMaintenanceTaskService;
 import org.springblade.modules.business.mapper.MaintenanceTaskMapper;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
@@ -45,6 +47,7 @@ import java.util.stream.Collectors;
 public class MaintenanceTaskServiceImpl extends BaseServiceImpl<MaintenanceTaskMapper, MaintenanceTask> implements IMaintenanceTaskService {
 
     private final IMaintenanceTaskDetailService taskDetailService;
+    private final IMaintenanceApplyGoodsService applyGoodsService;
 
     @Override
     public MaintenanceTask taskDetail(Long taskId) {
@@ -85,6 +88,8 @@ public class MaintenanceTaskServiceImpl extends BaseServiceImpl<MaintenanceTaskM
             Map<String, List<MaintenanceTaskDetail>> deptMap = floors.stream().collect(Collectors.groupingBy(MaintenanceTaskDetail::getDeptName));
             for (Map.Entry<String, List<MaintenanceTaskDetail>> listEntry : deptMap.entrySet()) {
                 MaintenanceTaskDetail dept = new MaintenanceTaskDetail();
+                List<MaintenanceTaskDetailGoods> applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getParentId, dept.getId()));
+                dept.setDetailGoodsList(applyGoodsList);
                 dept.setDeptName(listEntry.getKey());
                 dept.setDetails(listEntry.getValue());
                 deptList.add(dept);

src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java

@@ -22,16 +22,15 @@ public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message>
     /**
      * 保存消息
      *
-     * @param systemType
      * @param title
      * @param content
      * @param messageUser
      * @param messageType
      */
     @Override
-    public void saveMessage(String systemType, String title, String content, Long messageUser, Integer messageType) {
+    public void saveMessage(String title, String content, Long messageUser, Integer messageType) {
         Message saveInformation = new Message();
-        saveInformation.setSystemType(systemType);
+        saveInformation.setSystemType("1");
         saveInformation.setTitle(title);
         saveInformation.setContent(content);
         saveInformation.setMessageUser(messageUser);

src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@@ -60,6 +60,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IWorkOrderApprovalService approvalService;
 
+    private final IMessageService messageService;
+
     private final IDeptService deptService;
 
     private final IDeviceService deviceService;
@@ -129,12 +131,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // 查询今天已提报数量
             String hz = count < 9 ? "0" + (count + 1) : count + 1 + "";
             String code = "WX-" + todayStr + "-" + hz;
-
             workOrder.setFillingTime(now);
             workOrder.setRequirementCode(code);
             // 待接单
             workOrder.setStatus(WorkOrderStatusEnum.KH_ORDER_SUBMIT.getValue());
-
             if (user != null) {
                 workOrder.setInformant(user.getId());
                 workOrder.setInformantPhone(user.getPhone());
@@ -143,7 +143,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
             save = this.saveOrUpdate(workOrder);
             count++;
-
             // 保存附件
             saveFiles(workOrder.getVideoAttaches(), workOrder.getPicAttaches(), workOrder.getId());
         }