354798ggg
2023-11-14 443b575f774d8eb50c16d4eefccce5218fb8de2a
项目信息和出库信息高级搜索
已修改4个文件
44 ■■■■ 文件已修改
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectOutController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
@@ -42,7 +42,7 @@
            if (BaseUtil.strIsNull(fse.getString(CoreConst.CPAGE)) || BaseUtil.strIsNull(fse.getString(CoreConst.PAGESIZE))) {
                return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
            }
            return OK_List(projectInfoService.listProjectByCreated(fse.getInteger(Cmnconst.CPAGE), fse.getInteger(Cmnconst.PAGESIZE)));
            return OK_List(projectInfoService.listProjectByCreated(fse));
        } catch (BaseException e) {
            e.printStackTrace();
            return this.error(e);
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectOutController.java
@@ -35,7 +35,7 @@
            if (BaseUtil.strIsNull(fse.getString(Cmnconst.CPAGE)) || BaseUtil.strIsNull(fse.getString(Cmnconst.PAGESIZE))) {
                return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
            }
            return OK_List(projectOutService.listOutBound(fse.getInteger(Cmnconst.CPAGE), fse.getInteger(Cmnconst.PAGESIZE), fse.getString("filter")));
            return OK_List(projectOutService.listOutBound(fse));
        } catch (BaseException e) {
            e.printStackTrace();
            return this.error(e);
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
@@ -13,6 +13,7 @@
import com.product.core.exception.BaseException;
import com.product.core.permission.PermissionService;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.service.support.QueryFilterService;
import com.product.project.management.config.Cmnconst;
import com.product.project.management.config.SystemCode;
import com.product.util.BaseUtil;
@@ -28,16 +29,26 @@
    @Autowired
    PermissionService permissionService;
    
    @Autowired
    QueryFilterService queryFilterService;
    /**
     *     项目信息列表
     * @param cpage
     * @param pageSize
     * @return
     */
    public DataTableEntity listProjectByCreated(Integer cpage, Integer pageSize) {
        String queryFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
        DataTableEntity dt = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_QXLW, queryFilter, new Object [] {}, null, Cmnconst.CREATED_UTC_DATETIME_DESC, pageSize, cpage);
    public DataTableEntity listProjectByCreated(FieldSetEntity fse) {
        String queryFilter = " 1 = 1 ";
        String searchFilter = queryFilterService.getQueryFilter(fse);
        if (!BaseUtil.strIsNull(searchFilter)) {
            queryFilter += " AND " + searchFilter;
        }
        String limitFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
        if (!BaseUtil.strIsNull(limitFilter)) {
            queryFilter += " AND " + limitFilter;
        }
        DataTableEntity dt = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_QXLW, queryFilter, new Object [] {}, null, Cmnconst.CREATED_UTC_DATETIME_DESC, fse.getInteger(Cmnconst.PAGESIZE), fse.getInteger(Cmnconst.CPAGE));
        baseDao.loadPromptData(dt);
        return dt;
    }
product-server-project-management/src/main/java/com/product/project/management/service/ProjectOutService.java
@@ -5,6 +5,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.permission.PermissionService;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.service.support.QueryFilterService;
import com.product.project.management.config.Cmnconst;
import com.product.util.BaseUtil;
@@ -23,16 +24,26 @@
    @Autowired
    PermissionService permissionService;
    
    @Autowired
    QueryFilterService queryFilterService;
    
    public DataTableEntity listOutBound(Integer cpage, Integer pageSize, String filter) {
        
        String queryFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
        if (!BaseUtil.strIsNull(queryFilter)) {
            filter += " AND " + queryFilter;
    public DataTableEntity listOutBound(FieldSetEntity fse) {
        String filter = fse.getString("filter");
        String searchFilter = queryFilterService.getQueryFilter(fse);
        if (!BaseUtil.strIsNull(searchFilter)) {
            filter += " AND " + searchFilter;
        }
        String limitFilter = permissionService.getDataFilter(Cmnconst.PRODUCT_PROJECT_QXLW, "project_leader,materialman");
        if (!BaseUtil.strIsNull(limitFilter)) {
            filter += " AND " + limitFilter;
        }
        
        String sql = "SELECT * FROM product_project_outbound A LEFT JOIN product_project_qxlw B ON A.project_uuid = B.uuid  WHERE " + filter;
        DataTableEntity dt = baseDao.listTable(sql, new Object[] {}, pageSize, cpage);
        DataTableEntity dt = baseDao.listTable(sql, new Object[] {}, fse.getInteger(Cmnconst.PAGESIZE), fse.getInteger(Cmnconst.CPAGE));
        dt.getMeta().addAliasTable("product_project_outbound", "A");
        dt.getMeta().addAliasTable("product_project_qxlw", "B");
        baseDao.loadPromptData(dt);
        return dt;
    }