|
|
@@ -89,7 +89,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
Map checkOrderNo =null;
|
|
|
if (in.getType() == 1) {
|
|
|
- checkOrderNo = checkOrderNoDuration(in,my);
|
|
|
+ checkOrderNo = checkOrderNoDuration(in,my,1);
|
|
|
boolean isValid = (boolean) checkOrderNo.get("code");
|
|
|
if (isValid){
|
|
|
in.setTechStartProcess(0);
|
|
|
@@ -393,7 +393,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setUserNames(userNames);
|
|
|
if(in.getStatus()==null||in.getStatus()!=3) {
|
|
|
if (in.getType() == 1) {
|
|
|
- checkOrderNo = checkOrderNoDuration(in);
|
|
|
+ checkOrderNo = checkOrderNoDuration(in,null,2);
|
|
|
boolean isValid = (boolean) checkOrderNo.get("code");
|
|
|
if (isValid){
|
|
|
in.setTechStartProcess(0);
|
|
|
@@ -1762,7 +1762,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
return map;
|
|
|
}
|
|
|
- public Map checkOrderNoDuration( InputPublicRelease in,AdminListBo a) {
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param in 公出参数
|
|
|
+ * @param a 新增时需哟额外知道当前任务
|
|
|
+ * @param type 0查询 1新增 2修改
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public Map checkOrderNoDuration( InputPublicRelease in,AdminListBo a,int type) {
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(in.getOrderNo());
|
|
|
TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(in.getOrderNo());
|
|
|
OutPublicRelease outPublicRelease=null;
|
|
|
@@ -1814,6 +1822,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (outPublicRelease!=null){
|
|
|
data.setPublicReleaseName(outPublicRelease.getAname());
|
|
|
}
|
|
|
+ //不等于null的情况是新增,需要重新获取实际公出与人数与次数
|
|
|
+ if (type==1||type==2){
|
|
|
+ TOrderPublicReleaseCount update=new TOrderPublicReleaseCount();
|
|
|
+ update.setOrderNo(in.getOrderNo());
|
|
|
+ update.setFrequency(timesCount);
|
|
|
+ update.setActualDuration(count.doubleValue());
|
|
|
+ update.setPeopleCount(peopleList.size());
|
|
|
+ tOrderPublicReleaseCountMapper.updateByOrderNo(update);
|
|
|
+ }
|
|
|
data.setTimesCount(timesCount);
|
|
|
data.setPeopleCount(peopleList.size());
|
|
|
data.setUserName(t.getUserName());
|
|
|
@@ -1868,7 +1885,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
@Override
|
|
|
public Map checkOrderNoDuration( InputPublicRelease in){
|
|
|
- return checkOrderNoDuration(in,null);
|
|
|
+ return checkOrderNoDuration(in,null,0);
|
|
|
}
|
|
|
|
|
|
@Override
|