质量推送

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

@@ -146,31 +146,52 @@ public class IncidentTicketController {
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		String processor = incidentTicket.getProcessor();
+
+		String state = incidentTicket.getState();//单据状态
+		String informant = incidentTicket.getInformant();//填报人
+		String processor = incidentTicket.getProcessor();//处理人
+
 		String handle = incidentTicket.getHandle();
 		incidentTicket.setProcessor(null);
+		incidentTicket.setState(null);
+		incidentTicket.setInformant(null);
 		incidentTicket.setHandle(null);
 		QueryWrapper<IncidentTicket> queryWrapper = QueryGenerator.initQueryWrapper(incidentTicket, req.getParameterMap());
 		queryWrapper.eq("1","1");
+
 //		queryWrapper.last("and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
 //				"order by accident_number desc ");
-
+		if(StringUtils.isNotBlank(state)){
+			queryWrapper.in("state",state.split(","));
+		}
+		if(StringUtils.isNotBlank(informant)){
+			queryWrapper.in("informant",informant.split(","));
+		}
 		if(StringUtils.isNotBlank(processor)){
+			StringBuffer sb = new StringBuffer();
+			for(String o:processor.split(",")){
+				if(StringUtils.isBlank(sb.toString())){
+					sb.append("'").append(o).append("'");
+				}else{
+					sb.append(",'").append(o).append("'");
+				}
+			}
+
 			if(StringUtils.isBlank(handle)){
 
-				queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id = '"+processor+"' ) " +
+				queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id in ("+sb.toString()+") ) " +
 						"and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
 						"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
 
 			}else{
 				if(handle.equals("是")){
 
-					queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id = '"+processor+"' and confirm != '否') " +
+					queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id in ("+sb.toString()+")  and confirm != '否') " +
 							"and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
 							"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
 
 				}else{
-					queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id = '"+processor+"' and confirm = '否') " +
+					queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id in ("+sb.toString()+")  and confirm = '否') " +
 							"and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
 							"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
 				}
@@ -199,7 +220,7 @@ public class IncidentTicketController {
 			if(!o.getState().equals("1") && !o.getState().equals("2") && !o.getState().equals("3")){
 				String result = list.stream().map(IncidentTicketChildren::getU8Invoice).collect(Collectors.joining(","));
 				if(StringUtils.isNotBlank(result) && !result.equals("null")){
-					o.setU8Invoices(result);
+					o.setU8Invoices(result.replaceAll(",null","").replaceAll("null,",""));
 				}
 			}
 //			String result2 = list.stream().map(IncidentTicketChildren::getZhanghaoId).collect(Collectors.joining(","));
@@ -211,24 +232,24 @@ public class IncidentTicketController {
 				}
 			}
 
-			if(StringUtils.isNotBlank(o.getResponsibilityPerson1())){
-				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson1());
-				if(login != null){
-					o.setResponsibilityPerson1(login.getRealname());
-				}
-			}
-			if(StringUtils.isNotBlank(o.getResponsibilityPerson2())){
-				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson2());
-				if(login != null){
-					o.setResponsibilityPerson2(login.getRealname());
-				}
-			}
-			if(StringUtils.isNotBlank(o.getResponsibilityPerson3())){
-				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson3());
-				if(login != null){
-					o.setResponsibilityPerson3(login.getRealname());
-				}
-			}
+//			if(StringUtils.isNotBlank(o.getResponsibilityPerson1())){
+//				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson1());
+//				if(login != null){
+//					o.setResponsibilityPerson1(login.getRealname());
+//				}
+//			}
+//			if(StringUtils.isNotBlank(o.getResponsibilityPerson2())){
+//				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson2());
+//				if(login != null){
+//					o.setResponsibilityPerson2(login.getRealname());
+//				}
+//			}
+//			if(StringUtils.isNotBlank(o.getResponsibilityPerson3())){
+//				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson3());
+//				if(login != null){
+//					o.setResponsibilityPerson3(login.getRealname());
+//				}
+//			}
 		}
 
 		return Result.ok(pageList);

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

@@ -228,13 +228,13 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			BigDecimal sl = new BigDecimal("1");//税率
 			BigDecimal hl = new BigDecimal(exchangeRate);//汇率
 			//原币金额(无税) -- 原币无税金额=原币金额/(1+税率)
-			BigDecimal iOriMoney = new BigDecimal(practicalSum).divide(sl,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
+			BigDecimal iOriMoney = new BigDecimal(practicalSum).divide(sl,2,BigDecimal.ROUND_HALF_UP);//.setScale(2,BigDecimal.ROUND_HALF_UP);
 			//原币税额 原币金额-原币无税金额
 			BigDecimal iOriTaxPrice = new BigDecimal(practicalSum).subtract(iOriMoney);
 			//本币价税合计 原币金额*汇率
 			BigDecimal iSum = new BigDecimal(practicalSum).multiply(hl);
 			//本币金额 (本币无税金额) 本币金额/（1+税率）
-			BigDecimal iMoney = iSum.divide(sl,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
+			BigDecimal iMoney = iSum.divide(sl,2,BigDecimal.ROUND_HALF_UP);//.setScale(2,BigDecimal.ROUND_HALF_UP);
 			//本币税额 本币金额-本币无税金额
 			BigDecimal iTaxPrice = iSum.subtract(iMoney);
 
@@ -436,13 +436,13 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			BigDecimal sl = new BigDecimal("1.13");//税率
 			BigDecimal hl = new BigDecimal(exchangeRate);//汇率
 			//原币金额(无税) -- 原币无税金额=原币金额/(1+税率)
-			BigDecimal iOriMoney = new BigDecimal(practicalSum).divide(sl,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
+			BigDecimal iOriMoney = new BigDecimal(practicalSum).divide(sl,2,BigDecimal.ROUND_HALF_UP);//.setScale(2,BigDecimal.ROUND_HALF_UP);
 			//原币税额 原币金额-原币无税金额
 			BigDecimal iOriTaxPrice = new BigDecimal(practicalSum).subtract(iOriMoney);
 			//本币价税合计 原币金额*汇率
 			BigDecimal iSum = new BigDecimal(practicalSum).multiply(hl);
 			//本币金额 (本币无税金额) 本币金额/（1+税率）
-			BigDecimal iMoney = iSum.divide(sl,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
+			BigDecimal iMoney = iSum.divide(sl,2,BigDecimal.ROUND_HALF_UP);//.setScale(2,BigDecimal.ROUND_HALF_UP);
 			//本币税额 本币金额-本币无税金额
 			BigDecimal iTaxPrice = iSum.subtract(iMoney);
 
@@ -642,13 +642,13 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			BigDecimal sl = new BigDecimal("1.13");//税率
 			BigDecimal hl = new BigDecimal(exchangeRate);//汇率
 			//原币金额(无税) -- 原币无税金额=原币金额/(1+税率)
-			BigDecimal iOriMoney = new BigDecimal(practicalSum).divide(sl,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
+			BigDecimal iOriMoney = new BigDecimal(practicalSum).divide(sl,2,BigDecimal.ROUND_HALF_UP);//.setScale(2,BigDecimal.ROUND_HALF_UP);
 			//原币税额 原币金额-原币无税金额
 			BigDecimal iOriTaxPrice = new BigDecimal(practicalSum).subtract(iOriMoney);
 			//本币价税合计 原币金额*汇率
 			BigDecimal iSum = new BigDecimal(practicalSum).multiply(hl);
 			//本币金额 (本币无税金额) 本币金额/（1+税率）
-			BigDecimal iMoney = iSum.divide(sl,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP);
+			BigDecimal iMoney = iSum.divide(sl,2,BigDecimal.ROUND_HALF_UP);//.setScale(2,BigDecimal.ROUND_HALF_UP);
 			//本币税额 本币金额-本币无税金额
 			BigDecimal iTaxPrice = iSum.subtract(iMoney);