bug修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/controller/ChangesDimissionHandoverController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.utils.StringUtils;
@@ -94,7 +95,8 @@ public class ChangesDimissionHandoverController {
     @PreAuthorize("hasAnyAuthority('changes:dimission:save','changes:dimission:edit')")
     @PostMapping("save")
     public ResponseEntity save(@Valid @RequestBody ChangesDimissionHandoverDTO changesDimissionHandoverDTO) {
-        return changesDimissionHandoverService.saveHandover(changesDimissionHandoverDTO);
+        changesDimissionHandoverService.saveHandover(changesDimissionHandoverDTO);
+        return ResponseUtil.newInstance().add("businessTable", "changes_dimission").add("businessId", changesDimissionHandoverDTO.getCdId()).ok ("操作成功");
     }
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/ChangesDimissionHandoverService.java

@@ -37,13 +37,15 @@ public class ChangesDimissionHandoverService extends ServiceImpl<ChangesDimissio
 
     @Resource
     private ChangesDimissionHandoverMapper changesDimissionHandoverMapper;
+    @Resource
+    private ChangesDimissionMapper changesDimissionMapper;
 
     public IPage<ChangesDimissionHandoverDTO> findList(Page<ChangesDimissionHandoverDTO> page, QueryWrapper<ChangesDimissionHandover> queryWrapper){
         queryWrapper.eq("cdh.del_flag","0").eq("cdh.parent_id","0");
         return changesDimissionHandoverMapper.findList(page,queryWrapper);
     }
 
-    public ResponseEntity saveHandover(ChangesDimissionHandoverDTO changesDimissionHandoverDTO) {
+    public void saveHandover(ChangesDimissionHandoverDTO changesDimissionHandoverDTO) {
 
         if(ObjectUtil.isNotEmpty(changesDimissionHandoverDTO)){
             if(StringUtils.isNotBlank(changesDimissionHandoverDTO.getCdId())){
@@ -72,9 +74,12 @@ public class ChangesDimissionHandoverService extends ServiceImpl<ChangesDimissio
                     }
                 });
                 this.saveBatch(changesDimissionHandoverList);
+                ChangesDimission changesDimission = new ChangesDimission();
+                changesDimission.setId(changesDimissionHandoverDTO.getCdId());
+                changesDimission.setHandoverStatus(changesDimissionHandoverDTO.getHandoverStatus());
+                changesDimissionMapper.updateById(changesDimission);
             }
         }
-        return ResponseEntity.ok("保存成功");
     }
 
     public List<ChangesDimissionHandoverDTO> queryByCdId(String id) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/dto/ChangesDimissionHandoverDTO.java

@@ -48,6 +48,11 @@ public class ChangesDimissionHandoverDTO extends BaseDTO {
 
     private List<ChangesDimissionHandoverDTO> handoverDTOList;
 
+    /**
+     * 交接状态
+     */
+    private String handoverStatus;
+
     private static final long serialVersionUID = 1L;
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/mapstruct/ChangesDimissionHandoverWrapper.java

@@ -0,0 +1,17 @@
+package com.jeeplus.test.changes.dimission.service.mapstruct;
+
+import com.jeeplus.core.mapstruct.EntityWrapper;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimission;
+import com.jeeplus.test.changes.dimission.domain.ChangesDimissionHandover;
+import com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionDTO;
+import com.jeeplus.test.changes.dimission.service.dto.ChangesDimissionHandoverDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {})
+public interface ChangesDimissionHandoverWrapper extends EntityWrapper<ChangesDimissionHandoverDTO, ChangesDimissionHandover>{
+
+        ChangesDimissionHandoverWrapper INSTANCE = Mappers.getMapper(ChangesDimissionHandoverWrapper.class);
+
+}