|
|
@@ -91,7 +91,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
BigDecimal maxDuration= new BigDecimal(SecurityUtils.getLoginUser().getUser().getDept().getMaxDuration());
|
|
|
String maxDurationProjectFlag = configService.selectConfigByKey("maxDurationProject");
|
|
|
Boolean maxflag = Boolean.parseBoolean(maxDurationProjectFlag);
|
|
|
- Double myDuration=0d;
|
|
|
+ Double myDuration;
|
|
|
myDuration=getMyDuration(in,maxflag);
|
|
|
BigDecimal mySum = new BigDecimal(myDuration).add(new BigDecimal(in.getDuration()));
|
|
|
|
|
|
@@ -408,7 +408,6 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
|
|
|
|
|
|
public Double getMyDuration(ProjectStaffRecord in ,boolean flag) {
|
|
|
- Double myDuration = 0d;
|
|
|
Long pid=in.getPid();
|
|
|
Long aid=in.getAid();
|
|
|
if (!flag)pid=null;
|