Skip to content

G
gdtel-gztel-school-center
Commit 0a122fca by 彭祥礼
Options

数据导出调整

parent a09430e2
Showing with 111 additions and 39 deletions
common/src/main/java/com/winsun/bean/StudentCard.java
package com.winsun.bean; package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data; import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* @Description 大王卡证件稽核 * <学生不限量证件>
* @Author pxl * @Author pxl
* @Date 2020-05-20 * @Date 2020-06-04
*/ */
@Data @Data
@TableName ( "yx_student_card" ) @TableName ("hhr_student_card")
public class StudentCard implements Serializable { public class StudentCard implements Serializable {
private static final long serialVersionUID = 4106267216672888277L; private static final long serialVersionUID = 7092966613897062590L;
@TableId(value = "id",type = IdType.AUTO) @TableId(value = "id",type = IdType.AUTO)
private Integer id; private Integer id;
...@@ -151,7 +150,7 @@ public class StudentCard implements Serializable { ...@@ -151,7 +150,7 @@ public class StudentCard implements Serializable {
private String agentBusinessman; private String agentBusinessman;
/** /**
* 审核状态 1：未审核 2：审核通过 3：审核不通过 4：无效 * 审核状态 1：未审核 2：审核通过 3：审核不通过
*/ */
@TableField("audit_state" ) @TableField("audit_state" )
private Integer auditState; private Integer auditState;
......
common/src/main/java/com/winsun/bean/StudentCertUpload.java
...@@ -10,18 +10,18 @@ import java.io.Serializable; ...@@ -10,18 +10,18 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* @Description 大王卡证件稽核 * < 大王卡证件稽核>
* @Author pxl * @Author pxl
* @Date 2020-05-20 * @Date 2020-06-04
*/ */
@Data @Data
@TableName ( "yx_student_cert_upload" ) @TableName ("hhr_student_cert_upload")
public class StudentCertUpload implements Serializable { public class StudentCertUpload implements Serializable {
private static final long serialVersionUID = 4964608982013796074L; private static final long serialVersionUID = 824331112740316224L;
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id",type = IdType.AUTO)
private Integer id; private Integer id;
/** /**
......
service-manager/src/main/java/com/winsun/controller/SaleCensusController.java
...@@ -218,6 +218,9 @@ public class SaleCensusController extends BaseController{ ...@@ -218,6 +218,9 @@ public class SaleCensusController extends BaseController{
if(sysUserList.size()==0){ if(sysUserList.size()==0){
log.info("没有数据"); log.info("没有数据");
} }
for (SysUser sysUser : sysUserList) {
parentId.add(sysUser.getId());
}
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>(); Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
hhrUserWrapper.eq("parent_id",sysUserList.get(0).getId()); hhrUserWrapper.eq("parent_id",sysUserList.get(0).getId());
List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper); List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
...@@ -255,34 +258,51 @@ public class SaleCensusController extends BaseController{ ...@@ -255,34 +258,51 @@ public class SaleCensusController extends BaseController{
for (Map<String, Object> objectMap : dataList) { for (Map<String, Object> objectMap : dataList) {
userIds.add(objectMap.get("userId").toString()); userIds.add(objectMap.get("userId").toString());
} }
Wrapper<SalesOrder> wrapper = new EntityWrapper();
if(userIds.size()>0){
wrapper.in("user_id",userIds);
}
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper);
Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>(); Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>();
hhrUserWrapper1.in("id",userIds); hhrUserWrapper1.in("id",userIds);
List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1); List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1);
Wrapper<SysUser> sysUserWrapper = new EntityWrapper<>();
if(parentId.size()>0){
List<String> list= removeDuplicate(parentId);
sysUserWrapper.in("id",list);
}
List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
for (Map<String, Object> objectMap : dataList) { for (Map<String, Object> objectMap : dataList) {
String userId = objectMap.get("userId").toString(); String userId = objectMap.get("userId").toString();
Wrapper<SalesOrder> salesOrderWrapper = new EntityWrapper(); for (SalesOrder salesOrder : salesOrderList) {
salesOrderWrapper.eq("user_id",userId); if(userId.equals(salesOrder.getUserId())){
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(salesOrderWrapper); objectMap.put("name",salesOrder.getName());
SalesOrder salesOrder = salesOrderList.get(0); objectMap.put("account",salesOrder.getAccount());
objectMap.put("id",salesOrder.getId()); objectMap.put("salesSubst",salesOrder.getSalesSubst());
objectMap.put("userId",salesOrder.getUserId()); objectMap.put("salesSchool",salesOrder.getSalesSchool());
objectMap.put("name",salesOrder.getName()); for (HhrUser hhrUser : hhrUsers) {
objectMap.put("account",salesOrder.getAccount()); if(hhrUser.getId().equals(userId)){
objectMap.put("salesSubst",salesOrder.getSalesSubst()); objectMap.put("position",hhrUser.getPosition());
objectMap.put("salesSchool",salesOrder.getSalesSchool()); if(StringUtils.isNotBlank(hhrUser.getParentId())){
for (HhrUser hhrUser : hhrUsers) { for (SysUser sysUser : sysUserList) {
if(hhrUser.getId().equals(userId)){ if(hhrUser.getParentId().equals(sysUser.getId())){
objectMap.put("position",hhrUser.getPosition()); objectMap.put("leader",sysUser.getName());
if(StringUtils.isNotBlank(hhrUser.getParentId())){ break;
SysUser sysUser = sysUserMapper.selectById(hhrUser.getParentId()); }
if(sysUser != null){ objectMap.put("leader","");
objectMap.put("leader",sysUser.getName()); }
}
objectMap.put("leader","");
break;
} }
objectMap.put("position","");
} }
break; break;
} }
} }
objectMap.remove("userId");
} }
ServletOutputStream os = null; ServletOutputStream os = null;
List<Integer> columnWidths = new ArrayList<>(); List<Integer> columnWidths = new ArrayList<>();
...@@ -308,4 +328,16 @@ public class SaleCensusController extends BaseController{ ...@@ -308,4 +328,16 @@ public class SaleCensusController extends BaseController{
IOUtils.closeQuite(workbook, os); IOUtils.closeQuite(workbook, os);
} }
} }
/**
* List集合去除重复数据
* @param list
* @return
*/
public static List removeDuplicate(List list) {
HashSet h = new HashSet(list);
list.clear();
list.addAll(h);
return list;
}
} }
service-manager/src/main/java/com/winsun/controller/SalesOrderController.java
...@@ -278,6 +278,7 @@ public class SalesOrderController extends BaseController{ ...@@ -278,6 +278,7 @@ public class SalesOrderController extends BaseController{
String[] parentid = hhrUser.getParentIds().split("\\,"); String[] parentid = hhrUser.getParentIds().split("\\,");
if (parentid.length == 2) { if (parentid.length == 2) {
parentIds.add(parentid[1]); parentIds.add(parentid[1]);
parentId.add(parentid[1]);
} }
} }
} }
...@@ -292,6 +293,9 @@ public class SalesOrderController extends BaseController{ ...@@ -292,6 +293,9 @@ public class SalesOrderController extends BaseController{
if (sysUserList.size() == 0) { if (sysUserList.size() == 0) {
log.info("没有数据"); log.info("没有数据");
} }
for (SysUser sysUser : sysUserList) {
parentId.add(sysUser.getId());
}
Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>(); Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>();
hhrUserWrapper1.eq("parent_id", sysUserList.get(0).getId()); hhrUserWrapper1.eq("parent_id", sysUserList.get(0).getId());
List<HhrUser> hhrUserList1 = hhrUserMapper.selectList(hhrUserWrapper1); List<HhrUser> hhrUserList1 = hhrUserMapper.selectList(hhrUserWrapper1);
...@@ -313,6 +317,9 @@ public class SalesOrderController extends BaseController{ ...@@ -313,6 +317,9 @@ public class SalesOrderController extends BaseController{
if (sysUserList.size() == 0) { if (sysUserList.size() == 0) {
log.info("没有数据"); log.info("没有数据");
} }
for (SysUser sysUser : sysUserList) {
parentId.add(sysUser.getId());
}
Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>(); Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>();
hhrUserWrapper1.like("parent_ids", sysUserList.get(0).getId(), SqlLike.LEFT); hhrUserWrapper1.like("parent_ids", sysUserList.get(0).getId(), SqlLike.LEFT);
List<HhrUser> hhrUserList1 = hhrUserMapper.selectList(hhrUserWrapper1); List<HhrUser> hhrUserList1 = hhrUserMapper.selectList(hhrUserWrapper1);
...@@ -353,9 +360,15 @@ public class SalesOrderController extends BaseController{ ...@@ -353,9 +360,15 @@ public class SalesOrderController extends BaseController{
hhrUserWrapper1.in("id",userIds); hhrUserWrapper1.in("id",userIds);
userIds.removeAll(userIds); userIds.removeAll(userIds);
List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1); List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1);
Wrapper<SysUser> sysUserWrapper = new EntityWrapper<>();
if(parentId.size()>0){
List<String> list= removeDuplicate(parentId);
sysUserWrapper.in("id",list);
}
List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
for (SalesOrder salesOrder : salesOrderList) { for (SalesOrder salesOrder : salesOrderList) {
Map<String,Object> objectMap = new HashMap<>(); Map<String,Object> objectMap = new HashMap<>();
objectMap.put("id",salesOrder.getId());
objectMap.put("orderPhone",salesOrder.getOrderPhone()); objectMap.put("orderPhone",salesOrder.getOrderPhone());
objectMap.put("name",salesOrder.getName()); objectMap.put("name",salesOrder.getName());
objectMap.put("account",salesOrder.getAccount()); objectMap.put("account",salesOrder.getAccount());
...@@ -367,21 +380,34 @@ public class SalesOrderController extends BaseController{ ...@@ -367,21 +380,34 @@ public class SalesOrderController extends BaseController{
if(salesOrder.getUserId().equals(hhrUser.getId())){ if(salesOrder.getUserId().equals(hhrUser.getId())){
objectMap.put("position",hhrUser.getPosition()); objectMap.put("position",hhrUser.getPosition());
if(StringUtils.isNotBlank(hhrUser.getParentId())){ if(StringUtils.isNotBlank(hhrUser.getParentId())){
SysUser sysUser = sysUserMapper.selectById(hhrUser.getParentId()); for (SysUser sysUser : sysUserList) {
if(sysUser != null){ if(hhrUser.getParentId().equals(sysUser.getId())){
objectMap.put("leader",sysUser.getName()); objectMap.put("leader",sysUser.getName());
break;
}
objectMap.put("leader","");
} }
} }
objectMap.put("leader","");
if(StringUtils.isNotBlank(hhrUser.getParentIds())){ if(StringUtils.isNotBlank(hhrUser.getParentIds())){
String[] parentid = hhrUser.getParentIds().split("\\,"); String[] parentid = hhrUser.getParentIds().split("\\,");
if(parentid.length >= 2){ if(parentid.length == 2){
SysUser sysUser = sysUserMapper.selectById(parentid[1]); for (SysUser sysUser : sysUserList) {
if(sysUser != null){ if(parentid[1].equals(sysUser.getId())){
objectMap.put("leader",sysUser.getName()); objectMap.put("president",sysUser.getName());
break;
}
objectMap.put("president","");
} }
} }
objectMap.put("president","");
} }
objectMap.put("president","");
break; break;
}else{
objectMap.put("position","");
objectMap.put("president","");
objectMap.put("leader","");
} }
} }
dataList.add(objectMap); dataList.add(objectMap);
...@@ -1039,4 +1065,15 @@ public class SalesOrderController extends BaseController{ ...@@ -1039,4 +1065,15 @@ public class SalesOrderController extends BaseController{
return sdf.format(new Date(Long.valueOf(seconds+"000"))); return sdf.format(new Date(Long.valueOf(seconds+"000")));
} }
/**
* List集合去除重复数据
* @param list
* @return
*/
public static List removeDuplicate(List list) {
HashSet h = new HashSet(list);
list.clear();
list.addAll(h);
return list;
}
} }
service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
...@@ -238,6 +238,7 @@ public class StudentCardVerifyController extends BaseController { ...@@ -238,6 +238,7 @@ public class StudentCardVerifyController extends BaseController {
studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone); studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone); studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState); studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState);
studentCardWrapper.orderBy("audit_date",false);
if(StringUtils.isNotBlank(uploadDate)){ if(StringUtils.isNotBlank(uploadDate)){
String[] dates = uploadDate.split("\\,"); String[] dates = uploadDate.split("\\,");
if(!uploadDate.equals(",")){ if(!uploadDate.equals(",")){
...@@ -275,6 +276,7 @@ public class StudentCardVerifyController extends BaseController { ...@@ -275,6 +276,7 @@ public class StudentCardVerifyController extends BaseController {
studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone); studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone); studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState); studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState);
studentCardWrapper.orderBy("audit_date",false);
if(StringUtils.isNotBlank(uploadDate)){ if(StringUtils.isNotBlank(uploadDate)){
String[] dates = uploadDate.split("\\,"); String[] dates = uploadDate.split("\\,");
if(!uploadDate.equals(",")){ if(!uploadDate.equals(",")){
......
service-manager/src/main/java/com/winsun/controller/StudentDwkVerifyController.java
...@@ -170,6 +170,7 @@ public class StudentDwkVerifyController extends BaseController { ...@@ -170,6 +170,7 @@ public class StudentDwkVerifyController extends BaseController {
studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone); studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone); studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState); studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState);
studentCardWrapper.orderBy("audit_date",false);
if(StringUtils.isNotBlank(uploadDate)){ if(StringUtils.isNotBlank(uploadDate)){
String[] dates = uploadDate.split("\\,"); String[] dates = uploadDate.split("\\,");
if(!uploadDate.equals(",")){ if(!uploadDate.equals(",")){
...@@ -278,6 +279,7 @@ public class StudentDwkVerifyController extends BaseController { ...@@ -278,6 +279,7 @@ public class StudentDwkVerifyController extends BaseController {
studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone); studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone); studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState); studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState);
studentCardWrapper.orderBy("audit_date",false);
if(StringUtils.isNotBlank(uploadDate)){ if(StringUtils.isNotBlank(uploadDate)){
String[] dates = uploadDate.split("\\,"); String[] dates = uploadDate.split("\\,");
if(!uploadDate.equals(",")){ if(!uploadDate.equals(",")){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment