翻译

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -734,4 +734,20 @@ week.Wednesday=周三
 week.Thursday=周四
 week.Friday=周五
 week.Saturday=周六
-week.Sunday=周日
+week.Sunday=周日
+#合同
+contract.business= 买卖合同
+contract.gift= 赠与合同
+contract.lease= 租赁合同
+contract.loan= 借款合同
+contract.warehousing= 仓储合同
+contract.entrust= 委托合同
+contract.name = 合同名称
+contract.type = 合同类型
+contract.export = 合同_
+contract.addSuc = 添加成功
+contract.editSuc = 修改成功
+contract.operationSuc = 操作成功
+contract.numberRepeat = 合同编号已存在
+contract.typeNameEmpty = 合同类型名不可为空
+contract.typeNameRepeat = 合同类型名已存在

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -734,4 +734,20 @@ week.Wednesday=Wednesday
 week.Thursday=Thursday
 week.Friday=Friday
 week.Saturday=Saturday
-week.Sunday=Sunday
+week.Sunday=Sunday
+#合同
+contract.business= business contract
+contract.gift= Gift contract
+contract.lease= Lease contract
+contract.loan= Loan contract
+contract.warehousing= Warehousing contract
+contract.entrust= Entrustment contract
+contract.name = name
+contract.type = type
+contract.export = contract_
+contract.addSuc = Successfully added
+contract.editSuc = Modification succeeded
+contract.operationSuc = Operation succeeded
+contract.numberRepeat = Contract No. already exists
+contract.typeNameEmpty = Contract type name cannot be empty
+contract.typeNameRepeat = Contract type name already exists

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -848,7 +848,7 @@
     <select id="getWaitingReviewList" resultType="java.util.Map">
         <choose>
             <when test="stateKey==0">
-                SELECT 	dept_manager.name as userName,`user`.corpwx_userid as corpwxUserId,department.department_name as departmentName,COUNT(1) as num
+                SELECT 	dept_manager.name as userName,`user`.corpwx_userid as corpwxUserId,department.department_name as departmentName,department.corpwx_deptid as wxDeptId,COUNT(1) as num
                 FROM report AS a
                 left join user on user.id = a.creator_id
                 JOIN project AS b ON a.project_id=b.id