优化

platform-dao/src/main/java/com/platform/dao/dto/sbUnused/SbUnusedDTO.java

@@ -22,6 +22,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDTO extends BaseDTO implements Serializable {
+    private Boolean saveFlag;//是否提交？true：提交 false：修改
     private List<Integer> statusList;
     private Integer searchType;
     /**

platform-dao/src/main/resources/mapper/sbUnuseddetail/SbUnusedDetailMapper.xml

@@ -57,7 +57,7 @@
         from t_sb_unused_detail as unusedDetails left join t_sb_info sbInfo
         on sbInfo.id = unusedDetails.sb_id
         left join t_sb_position position on position.id=sbInfo.position_id
-                                                                                                                                                            <where>
+        <where>
             <include refid="List_Condition" />
         </where>
     </select>

platform-rest/src/main/java/com/platform/rest/controller/sbUnused/SbUnusedController.java

@@ -61,6 +61,22 @@ public class SbUnusedController {
       return new R<>(sbUnusedService.saveModelByDTO(sbUnusedDTO));
   }
 
+  @SysLog("设备闲置二次提交")
+  @PostMapping("/saveAgain")
+//  @PreAuthorize("@pms.hasPermission('sbUnused-unused-add')")
+  public R saveAgain(@Validated({AddGroup.class}) @RequestBody SbUnusedDTO sbUnusedDTO) {
+    sbUnusedService.saveAgain(sbUnusedDTO);
+    return new R<>();
+  }
+
+  @SysLog("设备闲置提交")
+  @PostMapping("/save")
+//  @PreAuthorize("@pms.hasPermission('sbUnused-unused-add')")
+  public R saveSbUnused(@Validated({AddGroup.class}) @RequestBody SbUnusedDTO sbUnusedDTO) {
+    sbUnusedService.save(sbUnusedDTO);
+    return new R<>();
+  }
+
 
   @SysLog("闲置设备审核")
   @PostMapping("/{id}")

platform-service/src/main/java/com/platform/service/sbUnused/SbUnusedService.java

@@ -14,6 +14,8 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface SbUnusedService extends IBaseService<SbUnused, SbUnusedDTO> {
+    void save(SbUnusedDTO dto);
+    void saveAgain(SbUnusedDTO dto);
     SbUnusedVO getModelById2(String id);
     void unusedVerify(String id,SbUnusedDTO dto);
 

platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -81,6 +81,73 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
         super.modModelByDTO(model);
     }
 
+    @Override
+    public void save(SbUnusedDTO dto) {
+        SbUnused unused = mapper.selectByPrimaryKey(dto.getId());
+        dto.setStatus(SbUnusedStatusEnum.verifying_one.getValue());
+        //改完重新提交
+        UserInfo userInfo = new UserInfo();
+        userInfo.setUserId(unused.getVerityUserId());
+        addRecord(userInfo, unused,"已申请",null);
+
+        List<String> userIds = new ArrayList<>();
+        userIds.add(unused.getVerityUserId());
+
+        String domain = getAndCheckPcDomain();
+        String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
+        String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
+                BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
+        sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
+    }
+
+    @Override
+    public void saveAgain(SbUnusedDTO dto) {
+        SbUnused unused = mapper.selectByPrimaryKey(dto.getId());
+            //仅修改
+            mapper.updateByPrimaryKeySelective(BeanConverterUtil.copyObjectProperties(dto,SbUnused.class));
+            List<SbInfoDTO> sbInfoDTOS = dto.getSbInfoDTOS();
+            SbUnusedDetailDTO sbUnusedDetailDTO = new SbUnusedDetailDTO();
+            sbUnusedDetailDTO.setSbUnusedId(dto.getId());
+            List<SbUnusedDetailVO> sbUnusedDetailVOS = sbUnusedDetailMapper.selectList(sbUnusedDetailDTO);
+            List<String> idList = new ArrayList<>();
+            for (SbUnusedDetailVO vo:sbUnusedDetailVOS){
+                Boolean flag  = false;
+                for (SbInfoDTO sbInfoDTO: sbInfoDTOS){
+                    if (sbInfoDTO.getId().equals(vo.getSbId())){
+                        flag = true;
+                        break;
+                    }
+                }
+                if (!flag){
+                    idList.add(vo.getId());
+                }
+            }
+            Weekend<SbUnusedDetail> weekend = new Weekend<>(SbUnusedDetail.class);
+            WeekendCriteria<SbUnusedDetail,Object> weekendCriteria = weekend.weekendCriteria();
+            weekendCriteria.andIn(SbUnusedDetail::getId,idList);
+            mapper.deleteByExample(weekend);
+
+        if (dto.getSaveFlag()){
+            //修改并提交
+            dto.setStatus(SbUnusedStatusEnum.verifying_one.getValue());
+
+            //改完重新提交
+            UserInfo userInfo = new UserInfo();
+            userInfo.setUserId(unused.getVerityUserId());
+            addRecord(userInfo, unused,"已申请",null);
+
+            List<String> userIds = new ArrayList<>();
+            userIds.add(unused.getVerityUserId());
+
+            String domain = getAndCheckPcDomain();
+            String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
+            String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
+                    BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
+            sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
+        }
+
+    }
+
     @Override
     public SbUnusedVO getModelById2(String id) {