TAIHE/taihe-xf-master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消费改造-人员同步筛选

Browse Source
This commit is contained in:
zc
2026-02-09 15:32:06 +08:00
parent 1d8f613999
commit 2d77fb02f7
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
renren-api/src/main/java/io/renren/controller/CardController.java
View File

@@ -406,38 +406,39 @@ public class CardController {
people.setDelFlag(0L); people.setDelFlag(0L);
people.setEquipmentId(equipment.getId()+""); people.setEquipmentId(equipment.getId()+"");
people.setPageNo(20); people.setPageNo(20);
List<SysPeople> sysPeopleList=peopleService.selectSysPeopleList(people); people.setConsumeStats(1);
if(sysPeopleList!=null&&sysPeopleList.size()>0){ List<SysPeople> sysPeopleList = peopleService.selectSysPeopleList(people);
if (CollUtil.isNotEmpty(sysPeopleList)) {
card.setApi("addperson"); card.setApi("addperson");
JSONArray whitelist=new JSONArray(); JSONArray whitelist = new JSONArray();
for(SysPeople p:sysPeopleList){ for (SysPeople p : sysPeopleList) {
if (StringUtils.isEmpty(p.getEquipmentId())){ if (StringUtils.isEmpty(p.getEquipmentId())) {
JSONObject obj=new JSONObject(); JSONObject obj = new JSONObject();
obj.put("rec_id",p.getId()); obj.put("rec_id", p.getId());
obj.put("account_id",p.getId()); obj.put("account_id", p.getId());
obj.put("emp_id",p.getGh()); obj.put("emp_id", p.getGh());
obj.put("emp_fname",p.getName()); obj.put("emp_fname", p.getName());
obj.put("depart_name",p.getBranch().getName()); obj.put("depart_name", p.getBranch().getName());
obj.put("tel",p.getPhone()); obj.put("tel", p.getPhone());
obj.put("valid_date","2099-01-01"); obj.put("valid_date", "2099-01-01");
obj.put("level_id","0"); obj.put("level_id", "0");
obj.put("card_sn",p.getDoorNo()); obj.put("card_sn", p.getDoorNo());
obj.put("url",p.getAvatar()); obj.put("url", p.getAvatar());
obj.put("groups",0); obj.put("groups", 0);
obj.put("access_pwd",p.getLoginPwd()); obj.put("access_pwd", p.getLoginPwd());
obj.put("twins",""); obj.put("twins", "");
obj.put("retain_photo","0"); obj.put("retain_photo", "0");
whitelist.add(obj); whitelist.add(obj);
//保存记录 //保存记录
SysPeopleEquipment spe=new SysPeopleEquipment(); SysPeopleEquipment spe = new SysPeopleEquipment();
spe.setPeopleId(p.getId()); spe.setPeopleId(p.getId());
spe.setEquipmentId(equipment.getId()); spe.setEquipmentId(equipment.getId());
peopleEquipmentService.insertSysPeopleEquipment(spe); peopleEquipmentService.insertSysPeopleEquipment(spe);
} }
} }
card.setWhitelist(whitelist); card.setWhitelist(whitelist);
String cards=gson.toJson(card); String cards = gson.toJson(card);
api=JSONObject.parseObject(cards); api = JSONObject.parseObject(cards);
return api; return api;
} }
//删除名单 //删除名单

9
renren-api/src/main/java/io/renren/entity/SysPeople.java
View File

@@ -100,6 +100,15 @@ public class SysPeople extends BaseEntity {
private String isConsume; private String isConsume;
private Integer consumeStats;
public Integer getConsumeStats() {
return consumeStats;
}
public void setConsumeStats(Integer consumeStats) {
this.consumeStats = consumeStats;
}
public String getOpenid() { public String getOpenid() {
return openid; return openid;

3
renren-api/src/main/resources/mapper/SysPeopleMapper.xml
View File

@@ -69,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="branchId != null "> <if test="branchId != null ">
AND (p.branch_id = #{branchId} OR p.branch_id IN ( SELECT t.id FROM sys_branch t WHERE find_in_set(#{branchId}, ancestors) )) AND (p.branch_id = #{branchId} OR p.branch_id IN ( SELECT t.id FROM sys_branch t WHERE find_in_set(#{branchId}, ancestors) ))
</if> </if>
<if test="consumeStats != null ">
AND (p.avatar is not null or p.door_no is not null)
</if>
<if test="delFlag != null"> <if test="delFlag != null">
<if test="delFlag == 0"> <if test="delFlag == 0">
<if test="equipmentId != null and equipmentId != ''"> and spe.equipment_id is null </if> <if test="equipmentId != null and equipmentId != ''"> and spe.equipment_id is null </if>