parent
4612125c75
commit
3c6cd595ca
|
@ -23,10 +23,9 @@ import com.hzya.frame.grpU8.nxproof.pubauditlog.dao.IPubAuditLogDao;
|
|||
import com.hzya.frame.grpU8.nxproof.pubauditlog.entity.PubAuditLogEntity;
|
||||
import com.hzya.frame.grpU8.nxproof.pubobjflow.dao.IPubObjFlowDao;
|
||||
import com.hzya.frame.grpU8.nxproof.pubobjflow.entity.PubObjFlowEntity;
|
||||
import com.hzya.frame.seeyon.enums.ColEventTypeEnum;
|
||||
import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
|
||||
import com.hzya.frame.mdm.entity.MdmDto;
|
||||
import com.hzya.frame.seeyon.enums.ColEventTypeEnum;
|
||||
import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
|
||||
import com.hzya.frame.web.entity.BaseResult;
|
||||
import com.hzya.frame.web.exception.BaseSystemException;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
|
@ -154,7 +153,7 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
|
|||
//保存日志表PubAuditLog
|
||||
List<PubAuditLogEntity> pubAuditLogEntityList = createPubAuditLog(jsonObject, maxMlId);
|
||||
for (PubAuditLogEntity pubAuditLog : pubAuditLogEntityList) {
|
||||
iPubAuditLogDao.save("PubAuditLogEntity_insert",pubAuditLog);
|
||||
iPubAuditLogDao.save("PubAuditLogEntity_insert",pubAuditLog);
|
||||
}
|
||||
//保存节点PUB_OBJ_FLOW
|
||||
PubObjFlowEntity pubObjFlowEntity = createPubObjFlow(jsonObject, maxMlId);
|
||||
|
@ -382,7 +381,7 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
|
|||
djnrEntityList.add(djnrEntity);
|
||||
}
|
||||
|
||||
return djnrEntityList;
|
||||
return djnrEntityList;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -672,6 +671,31 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
|
|||
gbiZbsyrecAllEntity.setKjnd(oerDjmlAllEntities.get(0).getKjnd());
|
||||
gbiZbsyrecAllEntity.setDjflmx(Integer.valueOf(oerDjmlAllEntities.get(0).getMlId()));
|
||||
gbiZbsyrecAllEntity.setModule("'OER'");
|
||||
|
||||
gbiZbsyrecAllEntity.setDjzt("0");
|
||||
iOerDjmlDao.updateGbiZbsyrecByDjid(gbiZbsyrecAllEntity);
|
||||
}else {
|
||||
return BaseResult.getFailureMessageEntity("根据单据编号存在多条报销单");
|
||||
}
|
||||
}else if(ColEventTypeEnum.ONPROCESSFINISHED.getType().equals(entity.getLclb())){//流程结束
|
||||
OerDjmlEntity oerDjmlAllEntity = new OerDjmlEntity();
|
||||
oerDjmlAllEntity.setDjbh(entity.getDjbh());
|
||||
List<OerDjmlEntity> oerDjmlAllEntities = iOerDjmlDao.queryOerDjml(oerDjmlAllEntity);
|
||||
if(oerDjmlAllEntities != null && oerDjmlAllEntities.size() == 1){
|
||||
//修改状态
|
||||
oerDjmlAllEntity.setMlId(oerDjmlAllEntities.get(0).getMlId());
|
||||
oerDjmlAllEntity.setZt(entity.getZt());
|
||||
iOerDjmlDao.updateOerDjmlZt(oerDjmlAllEntity);
|
||||
}else {
|
||||
return BaseResult.getFailureMessageEntity("根据单据编号存在多条报销单");
|
||||
}
|
||||
}else {
|
||||
return BaseResult.getFailureMessageEntity("流程类别错误");
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存方法前,先调这个方法 组装参数
|
||||
*
|
||||
|
@ -819,7 +843,7 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
|
|||
//支付方式为个人、公务卡时 可以选择 经办人、负责人、其他
|
||||
jsfs.setRytype("");
|
||||
//oa没有
|
||||
jsfs.setYt(forson.getString("field0030"));
|
||||
jsfs.setYt(forson.getString(""));
|
||||
jsfsList.add(jsfs);
|
||||
xh++;
|
||||
}
|
||||
|
@ -834,39 +858,8 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
gbiZbsyrecAllEntity.setDjzt("0");
|
||||
iOerDjmlDao.updateGbiZbsyrecByDjid(gbiZbsyrecAllEntity);
|
||||
}else {
|
||||
return BaseResult.getFailureMessageEntity("根据单据编号存在多条报销单");
|
||||
}
|
||||
}else if(ColEventTypeEnum.ONPROCESSFINISHED.getType().equals(entity.getLclb())){//流程结束
|
||||
OerDjmlEntity oerDjmlAllEntity = new OerDjmlEntity();
|
||||
oerDjmlAllEntity.setDjbh(entity.getDjbh());
|
||||
List<OerDjmlEntity> oerDjmlAllEntities = iOerDjmlDao.queryOerDjml(oerDjmlAllEntity);
|
||||
if(oerDjmlAllEntities != null && oerDjmlAllEntities.size() == 1){
|
||||
//修改状态
|
||||
oerDjmlAllEntity.setMlId(oerDjmlAllEntities.get(0).getMlId());
|
||||
oerDjmlAllEntity.setZt(entity.getZt());
|
||||
iOerDjmlDao.updateOerDjmlZt(oerDjmlAllEntity);
|
||||
}else {
|
||||
return BaseResult.getFailureMessageEntity("根据单据编号存在多条报销单");
|
||||
}
|
||||
}else {
|
||||
return BaseResult.getFailureMessageEntity("流程类别错误");
|
||||
}
|
||||
|
||||
/**
|
||||
* code和name拼接[]
|
||||
* @param code
|
||||
* @param name
|
||||
* @return 格式:03[公务卡]
|
||||
*/
|
||||
private String spliceStr(String code,String name){
|
||||
String template = "{}[{}]";
|
||||
return StrUtil.format(template,code,name);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @Author lvleigang
|
||||
|
@ -894,4 +887,14 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
|
|||
}
|
||||
return flag;
|
||||
}
|
||||
/**
|
||||
* code和name拼接[]
|
||||
* @param code
|
||||
* @param name
|
||||
* @return 格式:03[公务卡]
|
||||
*/
|
||||
private String spliceStr(String code,String name){
|
||||
String template = "{}[{}]";
|
||||
return StrUtil.format(template,code,name);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue