项目信息和出库信息高级搜索

354798ggg

2023-11-14 443b575f774d8eb50c16d4eefccce5218fb8de2a

 product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java

@@ -11,7 +11,9 @@
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
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;
@@ -23,7 +25,34 @@

    @Autowired
    BaseDao baseDao;

    
    @Autowired
    PermissionService permissionService;
    
    @Autowired
    QueryFilterService queryFilterService;
    
    /**
     *    项目信息列表
     * @param cpage
     * @param pageSize
     * @return
     */
    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;
    }
    
    /**
     * 通过项目类型获取项目分项（获取模板分项）
     *
@@ -60,7 +89,7 @@
     * @return
     */
    public DataTableEntity getProjectAllItem(String uuid) {
        DataTableEntity dtProjectItemize = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid=?", new Object[]{uuid}, new Object[]{CoreConst.UUID, Cmnconst.ITEMIZE, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE});
        DataTableEntity dtProjectItemize = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_ITEM, "project_uuid=?", new Object[]{uuid}, new Object[]{CoreConst.UUID, Cmnconst.ITEMIZE, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, Cmnconst.ITEMIZE_FULL_NAME});
        if (!BaseUtil.dataTableIsEmpty(dtProjectItemize)) {
            DataTableEntity newDtProjectItem = BaseUtil.dataTableToTreeTable(dtProjectItemize, Cmnconst.ITEMIZE_CODE, Cmnconst.ITEMIZE_PARENT_CODE, null);
            return newDtProjectItem;