anderx hace 1 año
padre
commit
97cd6188da

+ 2 - 1
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -411,10 +411,11 @@
                a.ceo_examine ceoExamine,a.cfo_examine cfoExamine ,a.vice_ceo_examine viceCeoExamine,a.cashier_examine cashierExamine,
                a.province, c.name financeName, a.working_hours_type workingHoursType, b.name as managerName,
                a.retrial_finance_id retrialFinanceId, d.name retrialFinanceName,a.approval,a.approval_aid approvalAid,e.name approvalName,
-                a.tech_admin_id techAdminId,g.name techAdminName
+                a.tech_admin_id techAdminId,g.name techAdminName,a.operation_guarantee_id operationGuaranteeId,h.name operationGuaranteeName
         from department a left join admin b on a.manager_id = b.id left join admin c on a.finance_id = c.id
                           left join admin d on a.retrial_finance_id=d.id left join admin e on a.approval_aid =e.id
                           left join admin f on a.expense_finance_id=f.id left join admin g on a.tech_admin_id=g.id
+                        left join admin h on a.operation_guarantee_id=h.id
         where a.id=#{id,jdbcType=VARCHAR}
     </select>
     <delete id="deleteById" parameterType="java.lang.String">

+ 20 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -113,12 +113,32 @@ public class OrganizationListOut {
     private Integer cashierExamine;
     private String techAdminId;
     private String techAdminName;
+
+    private String operationGuaranteeId;
+    private String operationGuaranteeName;
+
     private List<ExpenseConfigDetails> expenseRetrialFinanceExamineList;
     private List<ExpenseConfigDetails> ceoExamineList;
     private List<ExpenseConfigDetails> cfoExamineList;
     private List<ExpenseConfigDetails> viceCeoExamineList;
     private List<ExpenseConfigDetails> cashierExamineList;
 
+    public String getOperationGuaranteeId() {
+        return operationGuaranteeId;
+    }
+
+    public void setOperationGuaranteeId(String operationGuaranteeId) {
+        this.operationGuaranteeId = operationGuaranteeId;
+    }
+
+    public String getOperationGuaranteeName() {
+        return operationGuaranteeName;
+    }
+
+    public void setOperationGuaranteeName(String operationGuaranteeName) {
+        this.operationGuaranteeName = operationGuaranteeName;
+    }
+
     public String getTechAdminId() {
         return techAdminId;
     }