111

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/IncidentTicketServiceImpl.java

@@ -84,6 +84,7 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 		//1000001186
 		String cCode=addOne("0000001185");
 		System.out.println(Integer.parseInt(cCode)+1000000000);
+		System.out.println(DateUtils.formatDate(new Date(),"yyyy-MM-dd"));
 	}
 
 	@DS("master1")
@@ -157,8 +158,12 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			resMap.put("msg","业务类型有误 ："+businessType);
 			return resMap;
 		}
+		if(incidentTicket.getInvoicingDate() == null){
+			map.put("dPBVDate", DateUtils.getDate("yyyy-MM-dd"));//开票日期 当前日期
+		}else{
+			map.put("dPBVDate", DateUtils.formatDate(incidentTicket.getInvoicingDate(),"yyyy-MM-dd"));//开票日期 当前日期
+		}
 
-		map.put("dPBVDate", DateUtils.getDate("yyyy-MM-dd"));//开票日期 当前日期
 		String cVenCode = responsibilityCompanyMap.get("cVenCode").toString();
 		map.put("cVenCode", cVenCode);//供应商编码 对接质量事故单责任单位（U8显示简称即可）
 		String cUnitCode = responsibilityCompanyMap.get("cVenCode").toString();
@@ -361,7 +366,11 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			resMap.put("msg","业务类型有误 ："+businessType);
 			return resMap;
 		}
-		map.put("dPBVDate", DateUtils.getDate("yyyy-MM-dd"));//开票日期 当前日期
+		if(incidentTicket.getInvoicingDate() == null){
+			map.put("dPBVDate", DateUtils.getDate("yyyy-MM-dd"));//开票日期 当前日期
+		}else{
+			map.put("dPBVDate", DateUtils.formatDate(incidentTicket.getInvoicingDate(),"yyyy-MM-dd"));//开票日期 当前日期
+		}
 		String cVenCode = responsibilityCompanyMap.get("cVenCode").toString();
 		map.put("cVenCode", cVenCode);//供应商编码 对接质量事故单责任单位（U8显示简称即可）
 		String cUnitCode = responsibilityCompanyMap.get("cVenCode").toString();
@@ -565,7 +574,11 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			resMap.put("msg","业务类型有误 ："+businessType);
 			return resMap;
 		}
-		map.put("dPBVDate", DateUtils.getDate("yyyy-MM-dd"));//开票日期 当前日期
+		if(incidentTicket.getInvoicingDate() == null){
+			map.put("dPBVDate", DateUtils.getDate("yyyy-MM-dd"));//开票日期 当前日期
+		}else{
+			map.put("dPBVDate", DateUtils.formatDate(incidentTicket.getInvoicingDate(),"yyyy-MM-dd"));//开票日期 当前日期
+		}
 		String cVenCode = responsibilityCompanyMap.get("cVenCode").toString();
 		map.put("cVenCode", cVenCode);//供应商编码 对接质量事故单责任单位（U8显示简称即可）
 		String cUnitCode = responsibilityCompanyMap.get("cVenCode").toString();