质量事故单

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/IncidentTicketController.java

@@ -109,10 +109,12 @@ public class IncidentTicketController {
 		IPage<IncidentTicket> pageList = incidentTicketService.page(page, queryWrapper);
 
 		for (IncidentTicket o:pageList.getRecords()) {
-
-//			List<IncidentTicketChildren> list = incidentTicketChildrenService.selectByMainId(o.getId());
-//			String result = list.stream().map(IncidentTicketChildren::getPlanNumber).collect(Collectors.joining(","));
-//			o.setJiHuaHao(result);
+			//1未处理 2已通知 3通知已反馈 4已推送 5已完结
+			if(o.getState().equals("4") || o.getState().equals("5")){
+				List<IncidentTicketChildren> list = incidentTicketChildrenService.selectByMainId(o.getId());
+				String result = list.stream().map(IncidentTicketChildren::getU8Invoice).collect(Collectors.joining(","));
+				o.setU8Invoices(result);
+			}
 
 			if(StringUtils.isNotBlank(o.getResponsibilityPerson1())){
 				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson1());
@@ -317,10 +319,10 @@ public class IncidentTicketController {
 		if(!businessType.trim().equals("普通采购") && !businessType.trim().equals("委外加工")){
 			return Result.error("业务类型有误，请联系管理员");
 		}
-		String moneyType = incidentTicket.getMoneyType();//币种
-		if(StringUtils.isBlank(moneyType)){
-			return Result.error("币种为空无法同步");
-		}
+//		String moneyType = incidentTicket.getMoneyType();//币种
+//		if(StringUtils.isBlank(moneyType)){
+//			return Result.error("币种为空无法同步");
+//		}
 		String factory = incidentTicket.getFactory();//工厂
 		if(StringUtils.isBlank(factory)){
 			return Result.error("工厂为空无法同步");
@@ -342,6 +344,7 @@ public class IncidentTicketController {
 			String practicalSum = o.getPracticalSum();//实际事故金额
 			String zhanghaoId = o.getZhanghaoId();//账套号
 			String accidentType = o.getAccidentType();//事故类型 应补（负数） 扣款正数 不涉及金额（0）
+			String moneyType = o.getMoneyType();//币种
 			if(StringUtils.isNotBlank(u8Invoice)){
 				continue;
 			}
@@ -363,6 +366,9 @@ public class IncidentTicketController {
 			if(StringUtils.isBlank(accidentType)){
 				return Result.error("事故类型为空");
 			}
+			if(StringUtils.isBlank(moneyType)){
+				return Result.error("币种为空");
+			}
 			res = false;
 			Map<String,Object> cCode = new HashMap<>();
 			if(zhanghaoId.equals("101")){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/IncidentTicket.java

@@ -225,4 +225,7 @@ public class IncidentTicket implements Serializable {
 
 	@TableField(exist = false)
 	private String jiHuaHao;//计划号（子表中数据，以逗号分割显示）
+
+	@TableField(exist = false)
+	private String u8Invoices;//运费发票号（子表中数据，以逗号分割显示）
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/IncidentTicketChildren.java

@@ -95,4 +95,7 @@ public class IncidentTicketChildren implements Serializable {
 //	@Excel(name = "报错字段sort", width = 15)
 	@ApiModelProperty(value = "报错字段sort")
 	private String sort;
+
+	@ApiModelProperty(value = "币种")
+	private String moneyType;
 }

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

@@ -111,7 +111,7 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String businessType = incidentTicket.getBusinessType();//业务类型
-		String moneyType = incidentTicket.getMoneyType();//币种
+		String moneyType = children.getMoneyType();//币种
 		String accidentData = incidentTicket.getAccidentData();//日期
 //		String factory = incidentTicket.getFactory();//工厂
 		String responsibilityCompany = incidentTicket.getResponsibilityCompany();//责任单位
@@ -317,7 +317,7 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String businessType = incidentTicket.getBusinessType();//业务类型
-		String moneyType = incidentTicket.getMoneyType();//币种
+		String moneyType = children.getMoneyType();//币种
 		String accidentData = incidentTicket.getAccidentData();//日期
 //		String factory = incidentTicket.getFactory();//工厂
 		String responsibilityCompany = incidentTicket.getResponsibilityCompany();//责任单位
@@ -521,7 +521,7 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 		}
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String businessType = incidentTicket.getBusinessType();//业务类型
-		String moneyType = incidentTicket.getMoneyType();//币种
+		String moneyType = children.getMoneyType();//币种
 		String accidentData = incidentTicket.getAccidentData();//日期
 //		String factory = incidentTicket.getFactory();//工厂
 		String responsibilityCompany = incidentTicket.getResponsibilityCompany();//责任单位

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -316,7 +316,7 @@ public class SysUser implements Serializable {
     /**简历*/
 //    @Excel(name = "简历", width = 15)
     @ApiModelProperty(value = "简历")
-    private byte[] nResume;
+    private java.lang.String nResume;
     /**家庭成员*/
     @Excel(name = "家庭成员", width = 15)
     @ApiModelProperty(value = "家庭成员")