代码提交

杜洪波

5 天以前 f4dd94a2baed24ddcb28a4c2d2bf0f23f47e823a

代码提交

 src/main/java/com/product/badge/service/BadgeBorrowService.java

@@ -162,25 +162,25 @@
        StringBuilder sql = new StringBuilder();
        sql.append("\nselect d.table_uuid,d.uuid,table_name,c.org_level_name org_level_uuid,badge_name,type_name,cp.dict_label badge_type,holder,ifnull(badge_status,'未借出') badge_status,borrow_by,borrow_time,return_date,useful_life ");
        sql.append("\nfrom ( ");
        sql.append("\n    select '725928d8-a0ed-4f68-9e1d-87f66d899df0' table_uuid,'product_oa_badge_awards' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'获奖信息证章' type_name,holder,'永久' useful_life from product_oa_badge_awards ");
        sql.append("\n    select '725928d8-a0ed-4f68-9e1d-87f66d899df0' table_uuid,'product_oa_badge_awards' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'获奖信息证章' type_name,holder,'永久' useful_life from product_oa_badge_awards ");
        sql.append("\n    union all ");
        sql.append("\n    select '66d5e271-41bc-48c3-a0f5-6d696c70a036' table_uuid,'product_oa_badge_company' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'公司证章' type_name,holder,'永久' useful_life from product_oa_badge_company ");
        sql.append("\n    select '66d5e271-41bc-48c3-a0f5-6d696c70a036' table_uuid,'product_oa_badge_company' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'公司证章' type_name,holder,'永久' useful_life from product_oa_badge_company ");
        sql.append("\n    union all ");
        sql.append("\n    select '6468cd40-c9c9-41ff-b819-d670e3af9cee' table_uuid,'product_oa_badge_company_qualification' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'公司资质证章' type_name,holder,useful_life from product_oa_badge_company_qualification ");
        sql.append("\n    select '6468cd40-c9c9-41ff-b819-d670e3af9cee' table_uuid,'product_oa_badge_company_qualification' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'公司资质证章' type_name,holder,useful_life from product_oa_badge_company_qualification ");
        sql.append("\n    union all ");
        sql.append("\n    select 'a743e548-7b49-4f45-a072-acc03b873bdd' table_uuid,'product_oa_badge_constructor' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'建造师证章' type_name,holder,'永久' useful_life from product_oa_badge_constructor ");
        sql.append("\n    select 'a743e548-7b49-4f45-a072-acc03b873bdd' table_uuid,'product_oa_badge_constructor' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'建造师证章' type_name,holder,'永久' useful_life from product_oa_badge_constructor ");
        sql.append("\n    union all ");
        sql.append("\n    select 'c07d0bcd-3e2d-43b9-9df0-ae60c6d57577' table_uuid,'product_oa_badge_cost_officer' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'造价人员证章' type_name,holder,useful_life from product_oa_badge_cost_officer ");
        sql.append("\n    select 'c07d0bcd-3e2d-43b9-9df0-ae60c6d57577' table_uuid,'product_oa_badge_cost_officer' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'造价人员证章' type_name,holder,useful_life from product_oa_badge_cost_officer ");
        sql.append("\n    union all ");
        sql.append("\n    select '3d6d8e93-f347-4a07-abb0-c6ec7ccf907b' table_uuid,'product_oa_badge_finance_manage' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'财务管理证章' type_name,holder,'永久' useful_life from product_oa_badge_finance_manage ");
        sql.append("\n    select '3d6d8e93-f347-4a07-abb0-c6ec7ccf907b' table_uuid,'product_oa_badge_finance_manage' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'财务管理证章' type_name,holder,'永久' useful_life from product_oa_badge_finance_manage ");
        sql.append("\n    union all ");
        sql.append("\n    select '4cca65f6-dc58-443a-abb1-222524930d4c' table_uuid,'product_oa_badge_manager' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'管理人员证章' type_name,holder,useful_life from product_oa_badge_manager ");
        sql.append("\n    select '4cca65f6-dc58-443a-abb1-222524930d4c' table_uuid,'product_oa_badge_manager' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'管理人员证章' type_name,holder,useful_life from product_oa_badge_manager ");
        sql.append("\n    union all ");
        sql.append("\n    select 'a980ba45-e286-4e5d-ba39-a28d7a0de3dc' table_uuid,'product_oa_badge_safety_officer' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'安全人员证章' type_name,holder,'永久' useful_life from product_oa_badge_safety_officer ");
        sql.append("\n    select 'a980ba45-e286-4e5d-ba39-a28d7a0de3dc' table_uuid,'product_oa_badge_safety_officer' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'安全人员证章' type_name,holder,'永久' useful_life from product_oa_badge_safety_officer ");
        sql.append("\n    union all ");
        sql.append("\n    select '53dc61c1-70d3-493b-b271-b886f723e50d' table_uuid,'product_oa_badge_scene_manage' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'现场管理证章' type_name,holder,'永久' useful_life from product_oa_badge_scene_manage ");
        sql.append("\n    select '53dc61c1-70d3-493b-b271-b886f723e50d' table_uuid,'product_oa_badge_scene_manage' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'现场管理证章' type_name,holder,'永久' useful_life from product_oa_badge_scene_manage ");
        sql.append("\n    union all ");
        sql.append("\n    select '0761488e-d10f-4c25-8b57-469114d9b7b4' table_uuid,'product_oa_badge_scene_officer' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'现场工人证章' type_name,holder,'永久' useful_life from product_oa_badge_scene_officer ");
        sql.append("\n    select '0761488e-d10f-4c25-8b57-469114d9b7b4' table_uuid,'product_oa_badge_scene_officer' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'现场工人证章' type_name,holder,'永久' useful_life from product_oa_badge_scene_officer ");
        sql.append("\n) d ");
        sql.append("\nleft join ( ");
        sql.append("\n    select b.* from ( ");

 src/main/java/com/product/badge/service/BadgeService.java

@@ -8,6 +8,8 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.service.support.QueryFilterService;
import com.product.util.UnifySQLFunction;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -34,8 +36,9 @@
     */
    public DataTableEntity listTable(FieldSetEntity fse) {
        StringBuilder sql = new StringBuilder(512);
        sql.append("select * from (");
        sql.append("\nselect d.uuid,org_level_uuid,badge_name,badge_level,holder,badge_type,ifnull(badge_status,'未借出') badge_status,borrow_by,borrow_time,return_date,flow_flag");
        sql.append("\nselect * from (");
        sql.append("\n  select d.uuid,org_level_uuid,badge_name,badge_level,holder,badge_type,borrow_by,borrow_time,return_date,flow_flag,");
        sql.append("\n    ").append(UnifySQLFunction.ifnull("badge_status", "'未借出'", "badge_status"));
        sql.append("\nfrom ").append(fse.getTableName()).append(" d");
        sql.append("\nleft join ( ");
        sql.append("\n    select b.* from ( ");
@@ -56,11 +59,8 @@
        sql.append("\n        group by uuid ");
        sql.append("\n    ) t ");
        sql.append("\n    on b.uuid=t.uuid and b.borrow_time=t.last_borrow_time ");
        sql.append("\n) b ");
        sql.append("\non d.uuid=b.badge_uuid ");
        sql.append("\n  ) b on d.uuid=b.badge_uuid ");
        sql.append("\n) a ");


        String filter = publicService.getListFilter(fse, 0);

        if (!StringUtils.isEmpty(filter)) {