|
@@ -1,8 +1,5 @@
|
|
package com.miniframe.bisiness.system;
|
|
package com.miniframe.bisiness.system;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
import com.miniframe.core.ExecProcessFlow;
|
|
import com.miniframe.core.ExecProcessFlow;
|
|
import com.miniframe.core.ext.UtilTools;
|
|
import com.miniframe.core.ext.UtilTools;
|
|
import com.miniframe.generate.business.system.model.C00001BaseModel;
|
|
import com.miniframe.generate.business.system.model.C00001BaseModel;
|
|
@@ -10,10 +7,13 @@ import com.miniframe.generate.comm.system.D_C00001_ROWS_RECODE;
|
|
import com.miniframe.model.system.AdiProject;
|
|
import com.miniframe.model.system.AdiProject;
|
|
import com.miniframe.model.system.AdiProjectSQLBuilder;
|
|
import com.miniframe.model.system.AdiProjectSQLBuilder;
|
|
import com.miniframe.model.system.dao.AdiProjectMapper;
|
|
import com.miniframe.model.system.dao.AdiProjectMapper;
|
|
-import com.miniframe.model.system.dao.SysFileMapper;
|
|
|
|
-import com.miniframe.tools.XIDataUtils;
|
|
|
|
import com.miniframe.tools.XIDateTimeUtils;
|
|
import com.miniframe.tools.XIDateTimeUtils;
|
|
import com.miniframe.tools.XIUtils;
|
|
import com.miniframe.tools.XIUtils;
|
|
|
|
+import tk.mybatis.mapper.util.StringUtil;
|
|
|
|
+
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 基础系统,“项目分页查询”逻辑处理(重新生成不覆盖)。
|
|
* 基础系统,“项目分页查询”逻辑处理(重新生成不覆盖)。
|
|
@@ -29,12 +29,22 @@ public class C00001Service extends C00001BaseModel implements ExecProcessFlow {
|
|
String userId = getA_systemhead().getUserId();//当前用户ID
|
|
String userId = getA_systemhead().getUserId();//当前用户ID
|
|
Integer page = this.getA_c00001().getPage();
|
|
Integer page = this.getA_c00001().getPage();
|
|
Integer size = this.getA_c00001().getCount();
|
|
Integer size = this.getA_c00001().getCount();
|
|
|
|
+ String searchtag =this.getA_c00001().getSearchtag();
|
|
AdiProjectMapper projectDao = UtilTools.getBean(AdiProjectMapper.class);
|
|
AdiProjectMapper projectDao = UtilTools.getBean(AdiProjectMapper.class);
|
|
AdiProjectSQLBuilder sb =new AdiProjectSQLBuilder();
|
|
AdiProjectSQLBuilder sb =new AdiProjectSQLBuilder();
|
|
AdiProjectSQLBuilder.Criteria sc =sb.createCriteria();
|
|
AdiProjectSQLBuilder.Criteria sc =sb.createCriteria();
|
|
sc.andUidEqualTo(userId);
|
|
sc.andUidEqualTo(userId);
|
|
|
|
+ if(!StringUtil.isEmpty(searchtag)){
|
|
|
|
+ sb.or(sb.createCriteria().andNameLike("%"+searchtag+"%"));
|
|
|
|
+ sb.or(sb.createCriteria().andRemarkLike("%"+searchtag+"%"));
|
|
|
|
+ }
|
|
Long count = projectDao.countByExample(sb);
|
|
Long count = projectDao.countByExample(sb);
|
|
|
|
+
|
|
sb.setOrderByClause("create_time desc");
|
|
sb.setOrderByClause("create_time desc");
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
XIUtils.pageSet(page,size);
|
|
XIUtils.pageSet(page,size);
|
|
List<AdiProject> list = projectDao.selectByExample(sb);
|
|
List<AdiProject> list = projectDao.selectByExample(sb);
|
|
List <D_C00001_ROWS_RECODE > rows = new ArrayList<>();
|
|
List <D_C00001_ROWS_RECODE > rows = new ArrayList<>();
|