|
|
@ -91,7 +91,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
|
|
|
|
|
|
|
|
List<Custom> customs = customMapper.selectList(new EntityWrapper<Custom>().eq("mini_user_id", userId).eq("status_code","enable"));
|
|
|
|
List<Custom> customs = customMapper.selectList(new EntityWrapper<Custom>().eq("mini_user_id", userId).eq("status_code","enable"));
|
|
|
|
for(Custom custom:customs){
|
|
|
|
for(Custom custom:customs){
|
|
|
|
List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()));
|
|
|
|
List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()).orderBy("create_date", false));
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
jsonObject.put("custom",custom);
|
|
|
|
jsonObject.put("custom",custom);
|
|
|
|
jsonObject.put("customSupports",customSupports);
|
|
|
|
jsonObject.put("customSupports",customSupports);
|
|
|
@ -113,6 +113,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
}else if(type.equals("enable")){
|
|
|
|
}else if(type.equals("enable")){
|
|
|
|
miniUserId.eq("status_code","enable");
|
|
|
|
miniUserId.eq("status_code","enable");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
miniUserId.orderBy("create_date", false);
|
|
|
|
List<Custom> customs = customMapper.selectList(miniUserId);
|
|
|
|
List<Custom> customs = customMapper.selectList(miniUserId);
|
|
|
|
for(Custom custom:customs){
|
|
|
|
for(Custom custom:customs){
|
|
|
|
List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()));
|
|
|
|
List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()));
|
|
|
@ -168,7 +169,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
public JSONObject pcTodoCustomList(Integer pageNum,Integer pageSize){
|
|
|
|
public JSONObject pcTodoCustomList(Integer pageNum,Integer pageSize){
|
|
|
|
|
|
|
|
|
|
|
|
Integer count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "todo"));
|
|
|
|
Integer count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "todo"));
|
|
|
|
List<Custom> customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "todo"));
|
|
|
|
List<Custom> customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "todo").orderBy("create_date", false));
|
|
|
|
|
|
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
jsonObject.put("count",count);
|
|
|
|
jsonObject.put("count",count);
|
|
|
@ -188,10 +189,10 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
List<Custom> customs;
|
|
|
|
List<Custom> customs;
|
|
|
|
if(null==copycatId){
|
|
|
|
if(null==copycatId){
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "disable"));
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "disable"));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "disable"));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "disable").orderBy("create_date", false));
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id",copycatId));
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id",copycatId));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id",copycatId));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id",copycatId).orderBy("create_date", false));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for(Custom custom:customs){
|
|
|
|
for(Custom custom:customs){
|
|
|
|
String copycat = custom.getCopycatId();
|
|
|
|
String copycat = custom.getCopycatId();
|
|
|
@ -216,10 +217,10 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
List<Custom> customs;
|
|
|
|
List<Custom> customs;
|
|
|
|
if(null==copycatId){
|
|
|
|
if(null==copycatId){
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "enable"));
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "enable"));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "enable"));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "enable").orderBy("create_date", false));
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "enable").eq("copycat_id",copycatId));
|
|
|
|
count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "enable").eq("copycat_id",copycatId));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "enable").eq("copycat_id",copycatId));
|
|
|
|
customs = customMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Custom>().eq("status_code", "enable").eq("copycat_id",copycatId).orderBy("create_date", false));
|
|
|
|
}for(Custom custom:customs){
|
|
|
|
}for(Custom custom:customs){
|
|
|
|
String copycat = custom.getCopycatId();
|
|
|
|
String copycat = custom.getCopycatId();
|
|
|
|
PcUser pcUser = pcUserService.pcUserDetail(copycat);
|
|
|
|
PcUser pcUser = pcUserService.pcUserDetail(copycat);
|
|
|
@ -340,7 +341,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
public JSONObject enableCustomDetailInvoiceList(String customId,Integer pageNum,Integer pageSize){
|
|
|
|
public JSONObject enableCustomDetailInvoiceList(String customId,Integer pageNum,Integer pageSize){
|
|
|
|
|
|
|
|
|
|
|
|
Integer count = invoiceMapper.selectCount(new EntityWrapper<Invoice>().eq("custom_id", customId));
|
|
|
|
Integer count = invoiceMapper.selectCount(new EntityWrapper<Invoice>().eq("custom_id", customId));
|
|
|
|
List<Invoice> invoiceList = invoiceMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Invoice>().eq("custom_id", customId));
|
|
|
|
List<Invoice> invoiceList = invoiceMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Invoice>().eq("custom_id", customId).orderBy("create_date", false));
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
jsonObject.put("count",count);
|
|
|
|
jsonObject.put("count",count);
|
|
|
|
jsonObject.put("invoiceList",invoiceList);
|
|
|
|
jsonObject.put("invoiceList",invoiceList);
|
|
|
@ -366,7 +367,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
public JSONObject pcMessage(String copycatId){
|
|
|
|
public JSONObject pcMessage(String copycatId){
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
Integer count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id",copycatId));
|
|
|
|
Integer count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id",copycatId));
|
|
|
|
List<Custom> customs = customMapper.selectList(new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id", copycatId));
|
|
|
|
List<Custom> customs = customMapper.selectList(new EntityWrapper<Custom>().eq("status_code", "disable").eq("copycat_id", copycatId).orderBy("create_date", false));
|
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
|
for(Custom custom:customs){
|
|
|
|
for(Custom custom:customs){
|
|
|
|
jsonArray.add(custom.getId());
|
|
|
|
jsonArray.add(custom.getId());
|
|
|
|