Browse Source

处理公出最公出限制表接口开发

anderx 1 year ago
parent
commit
d8ccd66319

+ 4 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -305,9 +305,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 	}
 
 
 	private String getString(AdminListBo my, CheckOrderNoOut data,TOrderNew tOrderNew) {
 	private String getString(AdminListBo my, CheckOrderNoOut data,TOrderNew tOrderNew) {
-		String amountName="";
-		String amountType="";
-
+		String amountName=data.getAmountName();
+		String amountType=data.getAmountType();
 		String format = String.format("%s准备公出%s(%s)," +
 		String format = String.format("%s准备公出%s(%s)," +
 						"总计公出:%s人,%s次,%s时。%s,本次申请,%s。请确认是否同意本次公出?", my.getName(), data.getUserName(), data.getContractNo(),
 						"总计公出:%s人,%s次,%s时。%s,本次申请,%s。请确认是否同意本次公出?", my.getName(), data.getUserName(), data.getContractNo(),
 				data.getPeopleCount(), data.getTimesCount(), data.getDurationCount().stripTrailingZeros().toPlainString(), amountName,
 				data.getPeopleCount(), data.getTimesCount(), data.getDurationCount().stripTrailingZeros().toPlainString(), amountName,
@@ -1915,6 +1914,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			}
 
 
 		}
 		}
+		data.setDurationMax(useOyd.getMaxDuration());
 		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
 		TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(in.getOrderNo());
 		List<TTaskMember> tTaskMembers = tTaskMemberMapper.selectByOrderNo(tOrderNew.getOrderNo());
 		List<TTaskMember> tTaskMembers = tTaskMemberMapper.selectByOrderNo(tOrderNew.getOrderNo());
 		String amountName=null;
 		String amountName=null;
@@ -1961,7 +1961,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			map.put("code",true);
 			map.put("code",true);
 			map.put("data",null);
 			map.put("data",null);
 		}else {
 		}else {
-			data.setDurationMax(useOyd.getMaxDuration());
+
 			if (actualDuration.compareTo(data.getDurationMax())<1){
 			if (actualDuration.compareTo(data.getDurationMax())<1){
 				map.put("code",true);
 				map.put("code",true);
 				map.put("data",null);
 				map.put("data",null);