人员配置机构

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java

@@ -61,4 +61,16 @@ public class TsPositionController extends BaseController<TsPosition> {
         List<TsRole> roles=tsPositionService.getRole(positionId);
         return Result.success(roles);
     }
+
+    @ApiOperation("编辑岗位")
+    @PutMapping
+    public ResponseMessage<Object> updatePosition(@Validated(TsPosition.update.class) TsPosition tsPosition){
+        return tsPositionService.updatePosition(tsPosition);
+    }
+
+    @ApiOperation("删除岗位")
+    @DeleteMapping
+    public ResponseMessage<Object> deletePosition(@RequestParam String positionId){
+        return tsPositionService.deletePosition(positionId);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java

@@ -49,4 +49,11 @@ public interface TsPositionDao extends BaseMapper<TsPosition> {
      * @return List<TsRole>
      */
     List<TsRole> getRole(String positionId);
+
+    /**
+     * 查询岗位以及绑定的角色信息
+     * @param tsPosition：岗位信息
+     * @return List<TsPosition>
+     */
+    List<TsPosition> selectPositionAndRole(TsPosition tsPosition);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java

@@ -4,7 +4,9 @@ import com.adc.da.base.entity.BaseEntity;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.util.List;
 
+import com.adc.da.slrs.sarRole.entity.TsRole;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -33,9 +35,12 @@ import javax.validation.constraints.NotNull;
 public class TsPosition extends BaseEntity {
     public interface insert{
     }
+    public interface update{
+    }
 
     private static final long serialVersionUID = 1L;
 
+
     @ApiModelProperty(value = "操作时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -57,10 +62,15 @@ public class TsPosition extends BaseEntity {
     @ApiModelProperty(value = "类型(1为导入，2为新建）")
     private String type;
 
+    @NotNull(message = "id不能为空",groups = {update.class})
     @ApiModelProperty(value = "ID")
     @TableId(value = "id",type = IdType.UUID)
     private String id;
 
+    @ApiModelProperty(value = "绑定角色")
+    @TableField(exist = false)
+    private List<TsRole> roles;
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java

@@ -45,4 +45,18 @@ public interface ITsPositionService extends IService<TsPosition> {
      * @return ResponseMessage<Object>
      */
     ResponseMessage<Object> addPosition(TsPosition tsPosition);
+
+    /**
+     * 修改岗位
+     * @param tsPosition：岗位信息
+     * @return ResponseMessage<Object>
+     */
+    ResponseMessage<Object> updatePosition(TsPosition tsPosition);
+
+    /**
+     * 删除岗位
+     * @param positionId：岗位ID
+     * @return ResponseMessage<Object>
+     */
+    ResponseMessage<Object> deletePosition(String positionId);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java

@@ -38,11 +38,7 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
      */
     @Override
     public List<TsPosition> getPosition(TsPosition tsPosition) {
-        QueryWrapper<TsPosition> positionQueryWrapper=new QueryWrapper<>();
-        if(tsPosition.getName()!=null){
-            positionQueryWrapper.like("name","%"+tsPosition.getName()+"%");
-        }
-        return tsPositionDao.selectList(positionQueryWrapper);
+        return tsPositionDao.selectPositionAndRole(tsPosition);
     }
 
     /**
@@ -98,4 +94,40 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         tsPositionDao.insert(tsPosition);
         return Result.success();
     }
+
+    /**
+     * 修改岗位
+     * @param tsPosition：岗位信息
+     * @return ResponseMessage<Object>
+     */
+    @Override
+    public ResponseMessage<Object> updatePosition(TsPosition tsPosition) {
+        TsPosition oldPosition=tsPositionDao.selectById(tsPosition.getId());
+        if(oldPosition==null){
+            return Result.error("该岗位不存在");
+        }
+        if(!oldPosition.getType().equals("2")){
+            return Result.error("该岗位不可修改");
+        }
+        tsPositionDao.updateById(tsPosition);
+        return Result.success();
+    }
+
+    /**
+     * 删除岗位
+     * @param positionId：岗位ID
+     * @return ResponseMessage<Object>
+     */
+    @Override
+    public ResponseMessage<Object> deletePosition(String positionId) {
+        TsPosition oldPosition=tsPositionDao.selectById(positionId);
+        if(oldPosition==null){
+            return Result.error("该岗位不存在");
+        }
+        if(!oldPosition.getType().equals("2")){
+            return Result.error("该岗位不可修改");
+        }
+        tsPositionDao.deleteById(positionId);
+        return Result.success();
+    }
 }