瀏覽代碼

事故单审批流,提交时去掉工厂签章限制

yuansh 5 天之前
父節點
當前提交
dd2b1a50c6

+ 16 - 16
jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -400,24 +400,24 @@ public class ActBusinessController {
 
             try {
 
-                String responsibility_company = busiData.get("responsibility_company") == null || busiData.get("responsibility_company") == "" ? "" : busiData.get("responsibility_company").toString();
-                int isConfirm =  busiData.get("is_confirm") == null ? 0 : (Integer) busiData.get("is_confirm");
-                String ticketId =  busiData.get("id").toString();
+//                String responsibility_company = busiData.get("responsibility_company") == null || busiData.get("responsibility_company") == "" ? "" : busiData.get("responsibility_company").toString();
+//                int isConfirm =  busiData.get("is_confirm") == null ? 0 : (Integer) busiData.get("is_confirm");
+//                String ticketId =  busiData.get("id").toString();
 
-                int countNumChild = sysBaseAPI.getIncidentTicketChild(ticketId);//扣款
-//                int countNum = sysBaseAPI.getIncidentTicket(ticketId);//非公司承担
-                List<Map<String,String>> countSupplier = new ArrayList<>();
-
-                if(StringUtils.isNotBlank(responsibility_company)){
-                    countSupplier = getSupplierSrm(responsibility_company);
-                }
+//                int countNumChild = sysBaseAPI.getIncidentTicketChild(ticketId);//扣款
+////                int countNum = sysBaseAPI.getIncidentTicket(ticketId);//非公司承担
+//                List<Map<String,String>> countSupplier = new ArrayList<>();
+//
+//                if(StringUtils.isNotBlank(responsibility_company)){
+//                    countSupplier = getSupplierSrm(responsibility_company);
+//                }
 
-                if(StringUtils.isNotBlank(responsibility_company) && countNumChild > 0 && countSupplier.size() == 0){
-                    String factorySignature = busiData.get("factory_signature") == null || busiData.get("factory_signature") == "" ? "" : busiData.get("factory_signature").toString();
-                    if(StringUtils.isBlank(factorySignature)||factorySignature.equals("[]")){
-                        return Result.error("该事故单工厂签章为空,请上传后提交");
-                    }
-                }
+//                if(StringUtils.isNotBlank(responsibility_company) && countNumChild > 0 && countSupplier.size() == 0){
+//                    String factorySignature = busiData.get("factory_signature") == null || busiData.get("factory_signature") == "" ? "" : busiData.get("factory_signature").toString();
+//                    if(StringUtils.isBlank(factorySignature)||factorySignature.equals("[]")){
+//                        return Result.error("该事故单工厂签章为空,请上传后提交");
+//                    }
+//                }
 
 //                if(isConfirm != 1 && StringUtils.isNotBlank(responsibility_company)){
 //