|
|
@@ -158,20 +158,27 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private void addExpenseAccountLog(Integer eaid, Integer status,Integer processStatus,String aid, String str) {
|
|
|
addExpenseAccountLog(eaid,status,processStatus,aid,str,null);
|
|
|
}
|
|
|
-
|
|
|
+ private void addExpenseAccountLog(Integer eaid, Integer status,Integer processStatus,String aid, String str,Date date){
|
|
|
+ addExpenseAccountLog(eaid,status,processStatus,aid,str,date,null);
|
|
|
+ }
|
|
|
/**
|
|
|
* 新增报销日志
|
|
|
* @param eaid 报销编号
|
|
|
* @param status 状态 0发起 1通过 2完成 3驳回 4修改
|
|
|
* @param str 备注
|
|
|
*/
|
|
|
- private void addExpenseAccountLog(Integer eaid, Integer status,Integer processStatus,String aid, String str,Date date) {
|
|
|
+ private void addExpenseAccountLog(Integer eaid, Integer status,Integer processStatus,String aid, String str,Date date,Integer showStatus) {
|
|
|
ExpenseAccountLog eaLog=new ExpenseAccountLog();
|
|
|
eaLog.setEaid(eaid);
|
|
|
eaLog.setStatus(status);
|
|
|
eaLog.setRemarks(str);
|
|
|
eaLog.setProcessStatus(processStatus);
|
|
|
eaLog.setAuditor(aid);
|
|
|
+ if (showStatus!=null){
|
|
|
+ eaLog.setShowStatus(showStatus);
|
|
|
+ }else {
|
|
|
+ eaLog.setShowStatus(0);
|
|
|
+ }
|
|
|
if (date !=null)eaLog.setCreateTime(date);
|
|
|
expenseAccountLogMapper.insertSelective(eaLog);
|
|
|
}
|
|
|
@@ -188,14 +195,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
String str2=String.format("未设置[%s]审核。",EAProcessStatus.getDesc(in.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000L);
|
|
|
- addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date);
|
|
|
+ addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date,2);
|
|
|
in.setProcessStatus(in.getProcessStatus()+1);
|
|
|
}else {
|
|
|
if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
|
|
|
String str2=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(in.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000L);
|
|
|
- addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date);
|
|
|
+ addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date,2);
|
|
|
in.setProcessStatus(in.getProcessStatus()+1);
|
|
|
}
|
|
|
}
|
|
|
@@ -368,30 +375,33 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object updateTypeOther(Integer id, String typeOther) {
|
|
|
+ public Object updateTypeOther(Integer id, String typeOther,String remarks) {
|
|
|
ExpenseAccount ea = new ExpenseAccount();
|
|
|
ea.setId(id);
|
|
|
ea.setTypeOther(typeOther);
|
|
|
+ ea.setRemarks(remarks);
|
|
|
expenseAccountMapper.updateByPrimaryKeySelective(ea);
|
|
|
- MainExpenseAccount mainExpenseAccount = expenseAccountMapper.selectbySonId(id);
|
|
|
- StringBuffer types=new StringBuffer();
|
|
|
- for (SonExpenseAccount e : mainExpenseAccount.getSonList()) {
|
|
|
- if (e.getType()!=0){
|
|
|
- types=types.append(EATypes.getDescByCode(e.getType()));
|
|
|
- }else {
|
|
|
- types=types.append(e.getTypeOther());
|
|
|
- }
|
|
|
- if (e.getType()==2){
|
|
|
- if (e.getSecondaryType()==0){
|
|
|
- types=types.append("-").append(e.getSecondaryTypeOther());
|
|
|
- }else{
|
|
|
- String descByCode = EAsecondaryTypes.getDescByCode(e.getSecondaryType());
|
|
|
- types=types.append("-").append(descByCode);
|
|
|
+ if (typeOther!=null){
|
|
|
+ MainExpenseAccount mainExpenseAccount = expenseAccountMapper.selectbySonId(id);
|
|
|
+ StringBuffer types=new StringBuffer();
|
|
|
+ for (SonExpenseAccount e : mainExpenseAccount.getSonList()) {
|
|
|
+ if (e.getType()!=0){
|
|
|
+ types=types.append(EATypes.getDescByCode(e.getType()));
|
|
|
+ }else {
|
|
|
+ types=types.append(e.getTypeOther());
|
|
|
+ }
|
|
|
+ if (e.getType()==2){
|
|
|
+ if (e.getSecondaryType()==0){
|
|
|
+ types=types.append("-").append(e.getSecondaryTypeOther());
|
|
|
+ }else{
|
|
|
+ String descByCode = EAsecondaryTypes.getDescByCode(e.getSecondaryType());
|
|
|
+ types=types.append("-").append(descByCode);
|
|
|
+ }
|
|
|
}
|
|
|
+ types=types.append(",");
|
|
|
}
|
|
|
- types=types.append(",");
|
|
|
+ expenseAccountMapper.updateSonTypeOther(id,types.substring(0,types.length()-1));
|
|
|
}
|
|
|
- expenseAccountMapper.updateSonTypeOther(id,types.substring(0,types.length()-1));
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -711,7 +721,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
newEa.setExamineName(aname.substring(0,aname.length()-1));
|
|
|
}
|
|
|
addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
-
|
|
|
}else {
|
|
|
addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
newEa.setStatus(1);
|
|
|
@@ -824,7 +833,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
String str=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(newEa.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000l);
|
|
|
- addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date);
|
|
|
+ addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date,2);
|
|
|
if (newEa.getProcessStatus()==EAProcessStatus.BMFZRSH.getCode()){
|
|
|
addFinanceCount(admin.getDepFinance(),newEa.getCreateTime());
|
|
|
}
|
|
|
@@ -902,12 +911,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (str==null)str=String.format("未设置[%s]审核,跳过此流程",tip);
|
|
|
if (newEa.getProcessStatus()<EAProcessStatus.CNSH.getCode()){
|
|
|
date2.setTime(date2.getTime()+100);
|
|
|
- addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date2);
|
|
|
+ addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date2,2);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
examineByprocess(newEa,admin,dep,list);
|
|
|
}else {
|
|
|
date2.setTime(date2.getTime()+100);
|
|
|
- addExpenseAccountLog(newEa.getId(),2,newEa.getProcessStatus(),aid,str,date2);
|
|
|
+ addExpenseAccountLog(newEa.getId(),2,newEa.getProcessStatus(),aid,str,date2,2);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus());
|
|
|
newEa.setStatus(2);
|
|
|
}
|
|
|
@@ -1099,6 +1108,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
for (OutExpenseAccountLog log : listLog) {
|
|
|
if (!newLog.contains(log)){
|
|
|
log.setEaid(in.getId());
|
|
|
+ log.setShowStatus(1);
|
|
|
newLog.add(log);
|
|
|
}
|
|
|
}
|