Просмотр исходного кода

开单时新增部门技术总监

anderx 1 год назад
Родитель
Сommit
9fea0029df

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

@@ -403,10 +403,11 @@
                a.expense_finance_id expenseFinanceId,f.name expenseFinanceName,a.expense_retrial_finance_examine expenseRetrialFinanceExamine,
                a.expense_finance_id expenseFinanceId,f.name expenseFinanceName,a.expense_retrial_finance_examine expenseRetrialFinanceExamine,
                a.ceo_examine ceoExamine,a.cfo_examine cfoExamine ,a.vice_ceo_examine viceCeoExamine,a.cashier_examine cashierExamine,
                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.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.retrial_finance_id retrialFinanceId, d.name retrialFinanceName,a.approval,a.approval_aid approvalAid,e.name approvalName,
+                a.tech_admin_id techAdminId,g.name techAdminName
         from department a left join admin b on a.manager_id = b.id left join admin c on a.finance_id = c.id
         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 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 f on a.expense_finance_id=f.id left join admin g on a.tech_admin_id=g.id
         where a.id=#{id,jdbcType=VARCHAR}
         where a.id=#{id,jdbcType=VARCHAR}
     </select>
     </select>
     <delete id="deleteById" parameterType="java.lang.String">
     <delete id="deleteById" parameterType="java.lang.String">

+ 3 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -217,10 +217,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if (StringUtils.isNotBlank(dep.getRetrialFinanceId())){
 			if (StringUtils.isNotBlank(dep.getRetrialFinanceId())){
 				list.add(new TOrderExamine(o.getOrderNo(),0,dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
 				list.add(new TOrderExamine(o.getOrderNo(),0,dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
 			}
 			}
-		}
-		List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
-		for (Admin admin : admins) {
-			list.add(new TOrderExamine(o.getOrderNo(),0,admin.getId(),admin.getName()));
+			if(StringUtils.isNotBlank(dep.getTechAdminId())){
+				list.add(new TOrderExamine(o.getOrderNo(),0,dep.getTechAdminId(),dep.getTechAdminName()));
+			}
 		}
 		}
 		tOrderExamineMapper.insertBatch(list);
 		tOrderExamineMapper.insertBatch(list);
 		return list;
 		return list;

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

@@ -111,12 +111,30 @@ public class OrganizationListOut {
      * 出纳审核 0-不需要 ,1-需要
      * 出纳审核 0-不需要 ,1-需要
      */
      */
     private Integer cashierExamine;
     private Integer cashierExamine;
+    private String techAdminId;
+    private String techAdminName;
     private List<ExpenseConfigDetails> expenseRetrialFinanceExamineList;
     private List<ExpenseConfigDetails> expenseRetrialFinanceExamineList;
     private List<ExpenseConfigDetails> ceoExamineList;
     private List<ExpenseConfigDetails> ceoExamineList;
     private List<ExpenseConfigDetails> cfoExamineList;
     private List<ExpenseConfigDetails> cfoExamineList;
     private List<ExpenseConfigDetails> viceCeoExamineList;
     private List<ExpenseConfigDetails> viceCeoExamineList;
     private List<ExpenseConfigDetails> cashierExamineList;
     private List<ExpenseConfigDetails> cashierExamineList;
 
 
+    public String getTechAdminId() {
+        return techAdminId;
+    }
+
+    public void setTechAdminId(String techAdminId) {
+        this.techAdminId = techAdminId;
+    }
+
+    public String getTechAdminName() {
+        return techAdminName;
+    }
+
+    public void setTechAdminName(String techAdminName) {
+        this.techAdminName = techAdminName;
+    }
+
     public List<ExpenseConfigDetails> getExpenseRetrialFinanceExamineList() {
     public List<ExpenseConfigDetails> getExpenseRetrialFinanceExamineList() {
         return expenseRetrialFinanceExamineList;
         return expenseRetrialFinanceExamineList;
     }
     }