修改电工和班组相关逻辑

user-client/src/main/java/com/hp/user/client/service/ElectricianGroupService.java

@@ -34,6 +34,13 @@ public interface ElectricianGroupService {
 	 * @param query 查询条件
 	 * @return
 	 */
-	public PageResult<ElectricianGroupVO> queryElectricianGroupByQuey(PageQuery query);
+	public PageResult<ElectricianGroupVO> queryElectricianGroupByQuery(PageQuery query);
+	
+	/**
+	 * 删除班组
+	 * @param electricianGroupId 班组id
+	 * @return
+	 */
+	public Result deleteElectricianGroupById(String electricianGroupId);
 
 }

user-client/src/main/java/com/hp/user/client/service/ElectricianService.java

@@ -36,5 +36,20 @@ public interface ElectricianService {
 	 * @return
 	 */
 	public DataResult<ElectricianVO> queryElectricianById(String electricianId);
+	
+	/**
+	 * 批量修改电工状态
+	 * @param electricianIds 电工id
+	 * @param status 状态
+	 * @return
+	 */
+	public Result updateStatusBatch(String[] electricianIds,Integer status);
+	
+	/**
+	 * 删除电工
+	 * @param electricianId 电工id
+	 * @return
+	 */
+	public Result deleteElectricianById(String electricianId);
 
 }

user-service/src/main/java/com/hp/user/service/controller/ElectricianController.java

@@ -68,4 +68,27 @@ public class ElectricianController {
 	public DataResult<ElectricianVO> queryElectricianById(String electricianId) {
 		return electricianService.queryElectricianById(electricianId);
 	}
+	
+	/**
+	 * 批量修改员工状态
+	 * @param electricianIds 电工ids
+	 * @param status 电工状态
+	 * @return
+	 */
+	@RequestMapping("/updateStatusBatch")
+    @ApiOperation(value = "批量修改员工状态", notes = "批量修改员工状态", httpMethod = "POST")
+	public Result updateStatusBatch(@RequestBody String[] electricianIds,Integer status) {
+		return electricianService.updateStatusBatch(electricianIds, status);
+	}
+	
+	/**
+	 * 删除电工
+	 * @param electricianId 电工id
+	 * @return
+	 */
+	@RequestMapping("/deleteElectricianById")
+    @ApiOperation(value = "删除电工", notes = "删除电工", httpMethod = "POST")
+	public Result deleteElectricianById(String electricianId) {
+		return electricianService.deleteElectricianById(electricianId);
+	}
 }

user-service/src/main/java/com/hp/user/service/controller/ElectricianGroupController.java

@@ -2,6 +2,7 @@ package com.hp.user.service.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,7 +16,7 @@ import com.hp.user.client.service.ElectricianGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-@Api(tags = "地址API接口")
+@Api(tags = "班组")
 @RestController
 @RequestMapping("/electricianGroup")
 public class ElectricianGroupController {
@@ -25,13 +26,13 @@ public class ElectricianGroupController {
 
     @PostMapping("/createElectricianGroup")
 	@ApiOperation(value ="添加班组", notes = "添加班组", httpMethod = "POST")
-	public Result createElectricianGroup(ElectricianGroupVO electricianGroup) {
+	public Result createElectricianGroup(@RequestBody ElectricianGroupVO electricianGroup) {
 		return electricianGroupService.createElectricianGroup(electricianGroup);
 	}
 	
 	@PostMapping("/updateElectricianGroup")
 	@ApiOperation(value ="修改班组", notes = "修改班组", httpMethod = "POST")
-	public Result updateElectricianGroup(ElectricianGroupVO electricianGroup) {
+	public Result updateElectricianGroup(@RequestBody ElectricianGroupVO electricianGroup) {
 		return electricianGroupService.updateElectricianGroup(electricianGroup);
 	}
 	
@@ -42,8 +43,14 @@ public class ElectricianGroupController {
 	}
 	
 	@ApiOperation(value ="根据条件查询班组", notes = "根据条件查询班组", httpMethod = "POST")
-	@PostMapping("/queryElectricianGroupByQuey")
-	public PageResult<ElectricianGroupVO> queryElectricianGroupByQuey(PageQuery query) {
-		return electricianGroupService.queryElectricianGroupByQuey(query);
+	@PostMapping("/queryElectricianGroupByQuery")
+	public PageResult<ElectricianGroupVO> queryElectricianGroupByQuery(@RequestBody PageQuery query) {
+		return electricianGroupService.queryElectricianGroupByQuery(query);
+	}
+	
+	@ApiOperation(value ="根据id删除班组", notes = "根据id删除班组", httpMethod = "POST")
+	@PostMapping("/deleteElectricianGroupById")
+	public Result deleteElectricianGroupById(String electricianGroupId) {
+		return electricianGroupService.deleteElectricianGroupById(electricianGroupId);
 	}
 }

user-service/src/main/java/com/hp/user/service/dao/ElectricianElectricianGroupMapper.java

@@ -1,7 +1,12 @@
 package com.hp.user.service.dao;
 
 import com.hp.user.service.entity.ElectricianElectricianGroup;
-import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -10,6 +15,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yeqid
  * @since 2020-12-04
  */
-public interface ElectricianElectricianGroupMapper extends IService<ElectricianElectricianGroup> {
+public interface ElectricianElectricianGroupMapper extends BaseMapper<ElectricianElectricianGroup> {
+	
+	public void insertBatch(@Param("eegList") List<ElectricianElectricianGroup> electricianElectricianGroupList);
 
 }

user-service/src/main/java/com/hp/user/service/dao/ElectricianGroupMapper.java

@@ -24,7 +24,7 @@ public interface ElectricianGroupMapper extends BaseMapper<ElectricianGroup> {
 	@Select("select a.*,b.name as leaderName from tb_electrician_group a left join tb_electrician b on (a.group_leader = b.electrician_id) where a.electrician_group_id = #{id}")
 	public ElectricianGroup queryElectricianGroupById(@Param("id") String electricianGroupId);
 	
-	@Select("select * from v_electrician_group ${ew.customSqlSegment}")
+	@Select("select * from v_electrician_group ${ew.customSqlSegment} ")
 	public <E> Page<ElectricianGroup> queryElectricianGroupByQuey(E page,@Param(Constants.WRAPPER) Wrapper<ElectricianGroup> queryWrapper);
 
 }

user-service/src/main/java/com/hp/user/service/entity/Electrician.java

@@ -91,7 +91,7 @@ public class Electrician implements Serializable {
     /**
      * 是否删除，0（default）/1：未删除/删除
      */
-    private Boolean sysDeleted;
+    private Integer sysDeleted;
     
     public Electrician() {}
     

user-service/src/main/java/com/hp/user/service/entity/ElectricianGroup.java

@@ -50,6 +50,7 @@ public class ElectricianGroup implements Serializable {
     private String leaderName;
     
     private String teamMemberName;
+    private String electricianId;
 
     /**
      * 备注
@@ -75,6 +76,8 @@ public class ElectricianGroup implements Serializable {
      * 创建者
      */
     private String sysCreator;
+    
+    private Integer sysDeleted;
 
 
 }

user-service/src/main/java/com/hp/user/service/impl/ElectricianGroupServiceImpl.java

@@ -65,8 +65,8 @@ public class ElectricianGroupServiceImpl implements ElectricianGroupService{
 			}
 			ElectricianGroup electricianGroup = new ElectricianGroup();
 			String electricianGroupId = IdWorker.getIdStr();
-			electricianGroup.setElectricianGroupId(electricianGroupId);
 			BeanUtils.copyProperties(electricianGroupVO, electricianGroup);
+			electricianGroup.setElectricianGroupId(electricianGroupId);
 			electricianGroupMapper.insert(electricianGroup);
 			String[] electricianIds = StringUtils.split(electricianId,",");
 			ElectricianElectricianGroup electricianElectricianGroup;
@@ -77,11 +77,12 @@ public class ElectricianGroupServiceImpl implements ElectricianGroupService{
 				electricianElectricianGroup.setElectircianId(id);
 				electricianElectricianGroupList.add(electricianElectricianGroup);
 			}
-			QueryWrapper<ElectricianElectricianGroup> queryWrapper = new QueryWrapper<ElectricianElectricianGroup>();
-			queryWrapper.eq("electrician_group_id", electricianGroupId);
-			electricianElectricianGroupMapper.remove(queryWrapper);
-			electricianElectricianGroupMapper.saveBatch(electricianElectricianGroupList);
+//			QueryWrapper<ElectricianElectricianGroup> queryWrapper = new QueryWrapper<ElectricianElectricianGroup>();
+//			queryWrapper.eq("electrician_group_id", electricianGroupId);
+//			electricianElectricianGroupMapper.delete(queryWrapper);
+			electricianElectricianGroupMapper.insertBatch(electricianElectricianGroupList);
 		}catch(Exception e) {
+			e.printStackTrace();
 			result.setCode("-1");
 			result.setMessage("系统内部错误");
 		}
@@ -122,9 +123,24 @@ public class ElectricianGroupServiceImpl implements ElectricianGroupService{
 				result.setMessage("组长Id不能为空！");
 				return result;
 			}
+			String[] electricianIds = StringUtils.split(electricianId,",");
+			ElectricianElectricianGroup electricianElectricianGroup;
+			List<ElectricianElectricianGroup> electricianElectricianGroupList = new ArrayList<>();
+			for(String id : electricianIds) {
+				electricianElectricianGroup = new ElectricianElectricianGroup();
+				electricianElectricianGroup.setElectricianGroupId(electricianGroupId);
+				electricianElectricianGroup.setElectircianId(id);
+				electricianElectricianGroupList.add(electricianElectricianGroup);
+			}
+			QueryWrapper<ElectricianElectricianGroup> queryWrapper = new QueryWrapper<ElectricianElectricianGroup>();
+			queryWrapper.eq("electrician_group_id", electricianGroupId);
+			electricianElectricianGroupMapper.delete(queryWrapper);
+			
 			ElectricianGroup electricianGroup = new ElectricianGroup();
 			BeanUtils.copyProperties(electricianGroupVO, electricianGroup);
 			electricianGroupMapper.updateById(electricianGroup);
+			electricianElectricianGroupMapper.insertBatch(electricianElectricianGroupList);
+			
 		}catch(Exception e) {
 			result.setCode("-1");
 			result.setMessage("系统内部错误");
@@ -151,7 +167,7 @@ public class ElectricianGroupServiceImpl implements ElectricianGroupService{
 	}
 
 	@Override
-	public PageResult<ElectricianGroupVO> queryElectricianGroupByQuey(PageQuery query) {
+	public PageResult<ElectricianGroupVO> queryElectricianGroupByQuery(PageQuery query) {
 		PageResult<ElectricianGroupVO> result = new PageResult<ElectricianGroupVO>();
 		try {
 			Integer page = query.getPage();
@@ -159,10 +175,10 @@ public class ElectricianGroupServiceImpl implements ElectricianGroupService{
 			if(page == null || page == 0) {
 				return result;
 			}
-			QueryWrapper<ElectricianGroup> queryWrapper = null;
+			QueryWrapper<ElectricianGroup> queryWrapper = new QueryWrapper<ElectricianGroup>();
 			List<FuzzyQuery> fuzzyList = query.getFuzzyList();
+//			queryWrapper.eq("sys_deleted", 0);
 			if(CollectionUtils.isNotEmpty(fuzzyList)) {
-				queryWrapper = new QueryWrapper<ElectricianGroup>();
 				for(FuzzyQuery<?> fuzzy : fuzzyList) {
 					queryWrapper.like(fuzzy.getColumn(), fuzzy.getValue());
 				}
@@ -173,7 +189,7 @@ public class ElectricianGroupServiceImpl implements ElectricianGroupService{
 				list = electricianGroupMapper.selectList(queryWrapper);
 			}else {
 //				Pagination pag1;
-				System.out.println(queryWrapper.getCustomSqlSegment());
+//				System.out.println(queryWrapper.getCustomSqlSegment());
 				Page<ElectricianGroup> electricianPage = electricianGroupMapper.queryElectricianGroupByQuey(new Page<>(page,count), queryWrapper);
 //				Page<ElectricianGroup> electricianPage = electricianGroupMapper.selectPage(new Page<>(page,count), queryWrapper);
 				list = electricianPage.getRecords();
@@ -196,4 +212,20 @@ public class ElectricianGroupServiceImpl implements ElectricianGroupService{
 		return result;
 	}
 
+	@Override
+	public Result deleteElectricianGroupById(String electricianGroupId) {
+		Result result = new Result();
+		try {
+			ElectricianGroup electricianGroup = new ElectricianGroup();
+			electricianGroup.setElectricianGroupId(electricianGroupId);
+			electricianGroup.setSysDeleted(1);
+			electricianGroupMapper.updateById(electricianGroup);
+		}catch(Exception e) {
+			e.printStackTrace();
+			result.setCode("-1");
+			result.setMessage("系统内部错误");
+		}
+		return result;
+	}
+
 }

user-service/src/main/java/com/hp/user/service/impl/ElectricianServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hp.user.client.entity.DataResult;
@@ -148,4 +149,38 @@ public class ElectricianServiceImpl implements ElectricianService{
 		return result;
 	}
 
+	@Override
+	public Result updateStatusBatch(String[] electricianIds,Integer status) {
+		Result result = new Result();
+		try {
+			UpdateWrapper<Electrician> updateWrapper = new UpdateWrapper<Electrician>();
+			updateWrapper.in("electrician_id", electricianIds);
+			Electrician electrician = new Electrician();
+			electrician.setStatus(status);
+			electricianMapper.update(electrician, updateWrapper);
+		}catch(Exception e) {
+			result.setCode("-1");
+			result.setMessage("系统内部错误");
+		}
+		return result;
+	}
+
+	@Override
+	public Result deleteElectricianById(String electricianId) {
+		Result result = new Result();
+		try {
+			UpdateWrapper<Electrician> updateWrapper = new UpdateWrapper<Electrician>();
+			updateWrapper.eq("electrician_id", electricianId);
+			Electrician electrician = new Electrician();
+			electrician.setSysDeleted(1);
+			electricianMapper.update(electrician, updateWrapper);
+		}catch(Exception e) {
+			result.setCode("-1");
+			result.setMessage("系统内部错误");
+		}
+		return result;
+	}
+	
+	
+
 }

user-service/src/main/resources/mapper/ElectricianElectricianGroupMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hp.user.service.dao.ElectricianElectricianGroupMapper">
 
+
+	<insert id="insertBatch" parameterType="list">
+        insert into r_electrician_electrician_group(electrician_group_id,electircian_id) values
+        <foreach collection="eegList" item="eeg" separator=",">
+        
+            (#{eeg.electricianGroupId},#{eeg.electircianId})
+        </foreach>
+    </insert>
 </mapper>

user-service/src/test/java/com/hp/user/service/ElectricianGroupTest.java

@@ -15,6 +15,7 @@ import com.hp.user.client.entity.FuzzyQuery;
 import com.hp.user.client.entity.PageQuery;
 import com.hp.user.client.entity.PageResult;
 import com.hp.user.client.service.ElectricianGroupService;
+import com.hp.user.client.service.ElectricianService;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
@@ -23,19 +24,30 @@ public class ElectricianGroupTest {
 	@Autowired
 	private ElectricianGroupService electricianGroupService;
 	
+	@Autowired
+	private ElectricianService electricianService;
+	
 	@Test
 	public void queryElectricianGroupByQueyTest() {
 		PageQuery query = new PageQuery();
-		List<FuzzyQuery> list = new ArrayList<>();
-		FuzzyQuery fuzzy = new FuzzyQuery();
-		fuzzy.setColumn("team_member_name");
-		fuzzy.setValue("ts");
-		list.add(fuzzy);
-		query.setFuzzyList(list);
+//		List<FuzzyQuery> list = new ArrayList<>();
+//		FuzzyQuery fuzzy = new FuzzyQuery();
+//		fuzzy.setColumn("team_member_name");
+//		fuzzy.setValue("ts");
+//		list.add(fuzzy);
+//		query.setFuzzyList(list);
 		query.setPage(1);
 		query.setSize(4);
-		PageResult<ElectricianGroupVO> result = electricianGroupService.queryElectricianGroupByQuey(query);
+		PageResult<ElectricianGroupVO> result = electricianGroupService.queryElectricianGroupByQuery(query);
 		System.out.print(JSONObject.toJSONString(result));
 	}
+	
+	@Test
+	public void updateStatusBatch() {
+		String[] ids = new String[]{"1334106189948010498","1334373867325583362"};
+		Integer status = 0;
+		electricianService.updateStatusBatch(ids, status);
+		
+	}
 
 }