# fee

cost-service/src/main/resources/mapper/Cost.xml

@@ -11,13 +11,12 @@
     <select id="selectAll" resultMap="cost">
         SELECT
         t1.*,
-        ct.type_no,
-        ct.type_name,
-        ast.subject_no accounting_subject_no,
-        ast.name accounting_subject_name,
+        ifnull(ct.type_no,0) type_no,
+        ifnull(ct.type_name,'待补充') type_name,
+        ifnull(ast.subject_no,0) accounting_subject_no,
+        ifnull(ast.name,'待补充') accounting_subject_name,
         group_concat(distinct t2.username) as cost_current_reviewer
-        FROM
-        cost t1
+        from cost t1
         left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
         left join cost_type ct on t1.type_id = ct.id
         left join accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -37,11 +36,11 @@
 
     <select id="selectByCostNo" resultMap="cost">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
+               ifnull(ct.type_no, 0) type_no,
+               ifnull(ct.type_name, '待补充') type_name,
                ct.description,
-               ast.subject_no                        accounting_subject_no,
-               ast.name                              accounting_subject_name,
+               ifnull(ast.subject_no, 0)             accounting_subject_no,
+               ifnull(ast.name, '待补充')               accounting_subject_name,
                group_concat(distinct t2.username) as cost_current_reviewer
         FROM cost t1
                  left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
@@ -56,10 +55,10 @@
     <select id="selectByKeys" resultType="com.blt.other.module.cost.model.CostDomain">
         SELECT
         t1.*,
-        ct.type_no,
-        ct.type_name,
-        ast.subject_no accounting_subject_no,
-        ast.name accounting_subject_name,
+        ifnull(ct.type_no,0) type_no,
+        ifnull(ct.type_name,'待补充') type_name,
+        ifnull(ast.subject_no,0) accounting_subject_no,
+        ifnull(ast.name,'待补充') accounting_subject_name,
         group_concat(distinct t2.username) as cost_current_reviewer
         from cost t1
         left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no
@@ -307,10 +306,10 @@
     <select id="queryPage" resultType="com.blt.other.module.cost.model.CostDomain">
         SELECT
         t1.*,
-        ct.type_no,
-        ct.type_name,
-        ast.subject_no accounting_subject_no,
-        ast.name accounting_subject_name,
+        ifnull(ct.type_no,0) type_no,
+        ifnull(ct.type_name,'待补充') type_name,
+        ifnull(ast.subject_no,0) accounting_subject_no,
+        ifnull(ast.name,'待补充') accounting_subject_name,
         group_concat(distinct t2.username) as cost_current_reviewer
         from cost t1
         left join cost_current_reviewer t2 on t1.cost_no = t2.cost_no

cost-service/src/main/resources/mapper/CostDetailMapper.xml

@@ -5,10 +5,10 @@
 
     <select id="selectListByCostNo" resultType="com.blt.other.module.cost.model.CostDetailDomain">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
-               ast.subject_no accounting_subject_no,
-               ast.name       accounting_subject_name
+               ifnull(ct.type_no, 0)       type_no,
+               ifnull(ct.type_name, '待补充') type_name,
+               ifnull(ast.subject_no, 0)   accounting_subject_no,
+               ifnull(ast.name, '待补充')     accounting_subject_name
         FROM cost_detail t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -17,10 +17,10 @@
 
     <select id="selectByDetailNo" resultType="com.blt.other.module.cost.model.CostDetailDomain">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
-               ast.subject_no accounting_subject_no,
-               ast.name       accounting_subject_name
+               ifnull(ct.type_no, 0)       type_no,
+               ifnull(ct.type_name, '待补充') type_name,
+               ifnull(ast.subject_no, 0)   accounting_subject_no,
+               ifnull(ast.name, '待补充')     accounting_subject_name
         FROM cost_detail t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id

cost-service/src/main/resources/mapper/CostPlanDao.xml

@@ -9,10 +9,10 @@
 
     <select id="selectByNo" resultMap="costPlan">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
-               ast.subject_no accounting_subject_no,
-               ast.name       accounting_subject_name
+               ifnull(ct.type_no,0) type_no,
+               ifnull(ct.type_name,'待补充') type_name,
+               ifnull(ast.subject_no,0) accounting_subject_no,
+               ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -29,10 +29,10 @@
     <select id="selectAll" resultMap="costPlan">
         SELECT
         t1.*,
-        ct.type_no,
-        ct.type_name,
-        ast.subject_no accounting_subject_no,
-        ast.name accounting_subject_name
+        ifnull(ct.type_no,0) type_no,
+        ifnull(ct.type_name,'待补充') type_name,
+        ifnull(ast.subject_no,0) accounting_subject_no,
+        ifnull(ast.name,'待补充') accounting_subject_name
         FROM
         cost_plan t1
         left join cost_type ct on t1.type_id = ct.id

cost-service/src/main/resources/mapper/CostPlanTempMapper.xml

@@ -4,10 +4,10 @@
 <mapper namespace="com.blt.other.module.cost.dao.CostPlanTempDao">
     <select id="selectByNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
-               ast.subject_no accounting_subject_no,
-               ast.name       accounting_subject_name
+               ifnull(ct.type_no,0) type_no,
+               ifnull(ct.type_name,'待补充') type_name,
+               ifnull(ast.subject_no,0) accounting_subject_no,
+               ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -17,10 +17,10 @@
 
     <select id="selectListByPlanNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
-               ast.subject_no accounting_subject_no,
-               ast.name       accounting_subject_name
+               ifnull(ct.type_no,0) type_no,
+               ifnull(ct.type_name,'待补充') type_name,
+               ifnull(ast.subject_no,0) accounting_subject_no,
+               ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -45,10 +45,10 @@
 
     <select id="selectByPlanNoAndTypeNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
-               ast.subject_no accounting_subject_no,
-               ast.name       accounting_subject_name
+               ifnull(ct.type_no,0) type_no,
+               ifnull(ct.type_name,'待补充') type_name,
+               ifnull(ast.subject_no,0) accounting_subject_no,
+               ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id
@@ -59,10 +59,10 @@
 
     <select id="selectByPlanNoAndTempNo" resultType="com.blt.other.database.model.CostPlanTempDomain">
         SELECT t1.*,
-               ct.type_no,
-               ct.type_name,
-               ast.subject_no accounting_subject_no,
-               ast.name       accounting_subject_name
+               ifnull(ct.type_no,0) type_no,
+               ifnull(ct.type_name,'待补充') type_name,
+               ifnull(ast.subject_no,0) accounting_subject_no,
+               ifnull(ast.name,'待补充')       accounting_subject_name
         FROM cost_plan_temp t1
                  left join cost_type ct on t1.type_id = ct.id
                  left join bailun_other.accounting_subject ast on ct.accounting_subject_id = ast.id