pc修改-边民与边民组管理

sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupService.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pj.api.dto.GroupDto;
 import com.pj.current.satoken.StpUserUtil;
+import com.pj.enummj.DeleteStatus;
+import com.pj.enummj.IsLock;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleMapper;
@@ -33,7 +36,7 @@ import javax.swing.filechooser.FileSystemView;
 
 /**
  * Service: tb_group -- 互助组
- * @author qzy 
+ * @author qzy
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -54,6 +57,11 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
 	 * 增
 	 */
 	void add(TbGroup t) {
+		t.setCreateTime(new Date())
+				.setCreateName(StpUserUtil.getPCLoginInfo().getLoginName())
+				.setCreateBy(StpUserUtil.getPCLoginInfo().getLoginId())
+				.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode())
+				.setIsLock(IsLock.IS_LOCK_ON.getCode());
 		save(t);
 	}
 
@@ -68,6 +76,9 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
 	 * 改
 	 */
 	void update(TbGroup t) {
+		t.setUpdateTime(new Date())
+				.setUpdateName(StpUserUtil.getPCLoginInfo().getLoginName())
+				.setUpdateBy(StpUserUtil.getPCLoginInfo().getLoginId());
 		updateById(t);
 
 	}

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java

@@ -95,6 +95,15 @@ public class TbPeopleController {
         return AjaxJson.getPageData(so.getDataCount(), list);
     }
 
+    /**
+     * 查集合 - 查询没有进组的边民
+     */
+    @RequestMapping("getLeftPeople")
+    @SaCheckPermission(TbPeople.PERMISSION_CODE)
+    public AjaxJson getLeftPeople() {
+        List<TbPeople> list = tbPeopleService.getLeftPeople();
+        return AjaxJson.getPageData(Long.valueOf(list.size()), list);
+    }
 
     /**
      * 改 - 删除状态(0=禁用,1=启用)
@@ -144,9 +153,12 @@ public class TbPeopleController {
      * @date
      */
     @RequestMapping("applyAddGroup")
-    public AjaxJson addAppleGroup(@RequestParam("peopleId") Long peopleId, @RequestParam("groupId") Long groupId) {
-        int i = tbPeopleService.applyAddGroup(peopleId, groupId);
-        return AjaxJson.getSuccess("申请成功等待组长批准", i);
+    public AjaxJson addAppleGroup(@RequestParam("peopleIds") String peopleIds, @RequestParam("groupId") Long groupId) {
+        String[] peopleIdarr = peopleIds.split(",");
+        for (String peopleId: peopleIdarr) {
+            tbPeopleService.applyAddGroup(Long.valueOf(peopleId), groupId);
+        }
+        return AjaxJson.getSuccess("申请成功等待组长批准");
     }
 
     /**

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleMapper.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository;
 
 /**
  * Mapper: tb_people -- 边民
- * @author qzy 
+ * @author qzy
  */
 
 @Mapper
@@ -22,8 +22,8 @@ public interface TbPeopleMapper extends BaseMapper <TbPeople> {
 
 	/**
 	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
-	 * @param so 参数集合 
-	 * @return 数据列表 
+	 * @param so 参数集合
+	 * @return 数据列表
 	 */
 	List<TbPeople> getList(SoMap so);
 	int checkApplyExist(@Param("peopleId") Long peopleId);
@@ -32,6 +32,6 @@ public interface TbPeopleMapper extends BaseMapper <TbPeople> {
 	List <TbPeople>getMemberListByGroupId(SoMap so);
 	List <TbPeople>getMemberListByLeaderId(SoMap so);
 	int updateApplyStatus(@Param("status") int status,@Param("peopleId") Long peopleId);
-
+	List<TbPeople> getLeftPeople();
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleMapper.xml

@@ -7,7 +7,7 @@
 
 	<!-- ================================== 查询相关 ================================== -->
 	<!-- select id, name, code, sex, age, id_card, id_card_img, phone, bank_no, bank_code, bank_name, group_id, group_name, status, role, lng, lat, last_location, address, address_ids, detail_address, is_lock, left_price, judge_status, judge_content, register_time, judge_time, person_id, create_time, create_by, create_name, update_time, update_by, update_name, delete_status from tb_people  -->
-	
+
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.tb_people.TbPeople">
 
@@ -17,11 +17,11 @@
 			   p.group_id, p.group_name, p.status, p.role, p.lng, p.lat, p.last_location, p.address, p.address_ids,
 			   p.detail_address, p.is_lock, p.left_price, p.judge_status, p.judge_content, p.register_time, p.judge_time,
 			   p.person_id, p.create_time, p.create_by, p.create_name, p.update_time, p.update_by, p.update_name,
-			   p.delete_status
+			   p.delete_status, p.trade_area_id, p.trade_area_name
 		from  tb_people p
 	</sql>
 
-	
+
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
 		select * from tb_people
@@ -76,6 +76,11 @@
 		</where>
 	</select>
 
+
+	<select id="getLeftPeople" resultType="com.pj.tb_people.TbPeople">
+		select * from tb_people where group_id is null and (group_name is null or group_name='')
+	</select>
+
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
@@ -114,6 +119,8 @@
 			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>
 			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
+			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
 		</where>
 		order by
 		<choose>

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -48,7 +48,7 @@ import java.util.*;
 
 /**
  * Service: tb_people -- 边民
- * @author qzy 
+ * @author qzy
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -77,6 +77,9 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	TbGroupMapper tbGroupMapper;
 	/** 增 */
 	void add(TbPeople t){
+		t.setCreateTime(new Date())
+				.setCreateName(StpUserUtil.getPCLoginInfo().getLoginName())
+				.setCreateBy(StpUserUtil.getPCLoginInfo().getLoginId());
 		save(t);
 	}
 
@@ -87,6 +90,9 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 
 	/** 改 */
 	void update(TbPeople t){
+		t.setUpdateTime(new Date())
+				.setUpdateName(StpUserUtil.getPCLoginInfo().getLoginName())
+				.setUpdateBy(StpUserUtil.getPCLoginInfo().getLoginId());
 		updateById(t);
 
 	}
@@ -97,9 +103,14 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		return super.getById(id);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
-	List<TbPeople> getList(SoMap so) { 
-		return tbPeopleMapper.getList(so);	
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	List<TbPeople> getList(SoMap so) {
+		return tbPeopleMapper.getList(so);
+	}
+
+	/** 查集合 - 查询没有进组的边民 */
+	List<TbPeople> getLeftPeople() {
+		return tbPeopleMapper.getLeftPeople();
 	}
 
 	/**