oa

mec-biz/src/main/java/com/ym/mec/biz/service/impl/FinancialExpenditureServiceImpl.java

@@ -231,16 +231,16 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
     public void syncOaPayLog(Integer workOrderId,String fileUrl) throws Exception {
         PWorkOrderInfo pWorkOrderInfo = financialExpenditureDao.getWorkOrderInfo(workOrderId);
         if (pWorkOrderInfo != null){
-            Integer hasFinancial = financialExpenditureDao.findByBatchNoAndProcessNo(workOrderId);
-            if(hasFinancial != null){
-                return;
-            }
+//            Integer hasFinancial = financialExpenditureDao.findByBatchNoAndProcessNo(workOrderId);
+//            if(hasFinancial != null){
+//                return;
+//            }
             String formStructure = financialExpenditureDao.getFormStructure(workOrderId);
             JSONObject formData = JSONObject.parseObject(financialExpenditureDao.getFormData(workOrderId));
             OaFormStructureDto oaFormStructureDto = JSONObject.parseObject(formStructure, OaFormStructureDto.class);
             List<OaInputDto> oaInputDtos = oaFormStructureDto.getList();
             //课程退费和乐团退费需要单独处理
-            if(pWorkOrderInfo.getProcess().equals(34) ||
+            if(pWorkOrderInfo.getProcess().equals(33) ||
                     pWorkOrderInfo.getProcess().equals(22) ||
                     pWorkOrderInfo.getProcess().equals(19)){
                 List<FinancialExpenditure> financialExpenditureList = new ArrayList<>();
@@ -409,14 +409,18 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                             }
                         }
                     }
-                    for (FinancialExpenditure financialExpenditure : financialExpenditures) {
-                        financialExpenditure.setType(ExpenditureTypeEnum.REFUND);
-                        financialExpenditure.setFeeProject(FeeProjectEnum.REFUND);
-                        financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
-                        financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
+                    if(CollectionUtils.isNotEmpty(financialExpenditures)){
+                        for (FinancialExpenditure financialExpenditure : financialExpenditures) {
+                            financialExpenditure.setType(ExpenditureTypeEnum.REFUND);
+                            financialExpenditure.setFeeProject(FeeProjectEnum.REFUND);
+                            financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
+                            financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
+                        }
+                        financialExpenditureList = financialExpenditures;
+                    }
+                    for (FinancialExpenditure financialExpenditure : financialExpenditureList) {
                         musicGroupService.directQuitMusicGroupOa(financialExpenditure);
                     }
-                    financialExpenditureList = financialExpenditures;
                 }
                 financialExpenditureDao.batchInsert(financialExpenditureList);
             }else {

mec-biz/src/main/resources/config/mybatis/FinancialExpenditureMapper.xml

@@ -230,26 +230,26 @@
         <result property="deptId" column="dept_id"/>
     </resultMap>
     <select id="getWorkOrderInfo" resultMap="PWorkOrderInfo">
-        SELECT woi.*,su.mec_user_id FROM oa_pro.p_work_order_info woi
-        LEFT JOIN oa_pro.p_work_order_circulation_history woch ON woi.id = woch.work_order
-        LEFT JOIN oa_pro.p_process_info pi ON pi.id = woi.classify
-        LEFT JOIN oa_pro.sys_user su ON su.user_id = woi.creator
+        SELECT woi.*,su.mec_user_id FROM mec_dev_api.p_work_order_info woi
+        LEFT JOIN mec_dev_api.p_work_order_circulation_history woch ON woi.id = woch.work_order
+        LEFT JOIN mec_dev_api.p_process_info pi ON pi.id = woi.classify
+        LEFT JOIN mec_dev_api.sys_user su ON su.user_id = woi.creator
         WHERE woi.is_end = 1  AND woi.is_denied = 0  AND woi.is_cancel = 0
         AND woch.`status` != 0 AND woi.id = #{workOrderId} AND pi.fee_type = 1 LIMIT 1
     </select>
     <select id="getFormStructure" resultType="java.lang.String">
-        SELECT form_structure FROM oa_pro.p_work_order_tpl_data WHERE work_order = #{workOrderId}
+        SELECT form_structure FROM mec_dev_api.p_work_order_tpl_data WHERE work_order = #{workOrderId}
     </select>
     <select id="getFormData" resultType="java.lang.String">
-        SELECT form_data FROM oa_pro.p_work_order_tpl_data WHERE work_order = #{workOrderId}
+        SELECT form_data FROM mec_dev_api.p_work_order_tpl_data WHERE work_order = #{workOrderId}
     </select>
     <select id="getTplInfo" resultType="java.lang.String">
-        SELECT form_structure FROM oa_pro.p_tpl_info WHERE id = #{tplInfoId}
+        SELECT form_structure FROM mec_dev_api.p_tpl_info WHERE id = #{tplInfoId}
     </select>
     <select id="findByBatchNoAndProcessNo" resultType="integer">
         SELECT id_ FROM financial_expenditure WHERE batch_no_ = #{workOrderId} AND financial_process_no_ = #{workOrderId} LIMIT 1
     </select>
     <select id="getDeptId" resultType="java.lang.Integer">
-        SELECT organ_id FROM oa_pro.sys_dept WHERE dept_id = #{deptId}
+        SELECT organ_id FROM mec_dev_api.sys_dept WHERE dept_id = #{deptId}
     </select>
 </mapper>