1.季度审核B表最后一个部门主任审批后修改对记录部门主任的参数。修复bug,该bug导致最后一个部门主任无法记录历史审批人以及流转记录
2.项目预算执行率列表增加根据创建时间倒序排列
This commit is contained in:
parent
1415a928b0
commit
7a29d02363
@ -29,7 +29,6 @@ import com.xqopen.kehui.util.ApiResponse;
|
||||
import com.xqopen.kehui.util.PageNoUtil;
|
||||
import com.xqopen.kehui.util.ResultListReqUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.list.TransformedList;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||
@ -217,7 +216,7 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
|
||||
map.put("isBusiness", true);//添加当前是部门主任的标记
|
||||
if(businessNumber==3){
|
||||
map.put("taskName", "管理员审核");
|
||||
map.put("businessNumber", 0);
|
||||
// map.put("businessNumber", 0);
|
||||
}
|
||||
else{
|
||||
map.put("taskName", "部门主任评级");
|
||||
@ -479,6 +478,7 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
|
||||
if (!str.contains(String.valueOf(userId))) {
|
||||
historyExecutor = str + "," + userId;
|
||||
ext.put("historyExecutor", historyExecutor);
|
||||
ext.put("businessNumber",0);//将最后一个人流转记录修改后,将参数归零
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user