@ -139,7 +139,7 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
qw . orderByDesc ( "id" ) ;
return qw ;
}
public PagerVo < SealRecordVo > listPageVo ( PagerQuery < SealRecordQuery > pq ) {
SealRecordQuery query = pq . getParams ( ) ;
QueryWrapper < SealRecord > qw = createQueryWrapper ( query ) ;
@ -148,7 +148,7 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
PagerVo < SealRecordVo > p = PagerUtil . pageToVo ( pagging , null ) ;
return p ;
}
public ResultBean saveOrUpdateDto ( SealRecordDto dto ) {
ResultBean rb = ResultBean . fireFail ( ) ;
String dtoSid = dto . getSid ( ) ;
@ -190,11 +190,11 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
if ( StringUtils . isBlank ( dtoSid ) ) {
SealRecord sealRecord = this . insertByDto ( dto ) ;
return rb . success ( ) . setData ( sealRecord . getSid ( ) ) ;
}
}
this . updateByDto ( dto ) ;
return rb . success ( ) . setData ( dto . getSid ( ) ) ;
}
public SealRecord insertByDto ( SealRecordDto dto ) {
SealRecord entity = new SealRecord ( ) ;
StringBuilder files = new StringBuilder ( ) ;
@ -208,7 +208,7 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
baseMapper . insert ( entity ) ;
return entity ;
}
public void updateByDto ( SealRecordDto dto ) {
String dtoSid = dto . getSid ( ) ;
if ( StringUtils . isBlank ( dtoSid ) ) {
@ -225,7 +225,7 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
entity . setFile_path ( paths ) ;
baseMapper . updateById ( entity ) ;
}
public SealRecordDetailsVo fetchDetailsVoBySid ( String sid ) {
SealRecord entity = fetchBySid ( sid ) ;
if ( entity = = null ) {
@ -249,7 +249,7 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
return vo ;
}
public ResultBean submit ( SealRecordDto dto ) {
public ResultBean submitOld ( SealRecordDto dto ) {
ResultBean resultBean = this . saveOrUpdateDto ( dto ) ;
boolean success = resultBean . getSuccess ( ) ;
if ( ! success ) {
@ -264,8 +264,7 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
BeanUtil . copyProperties ( dto , bv ) ;
bv . setOrgSidPath ( dto . getCreaterOrgPath ( ) = = null ? "" : dto . getCreaterOrgPath ( ) ) ;
bv . setBusinessSid ( businessSid ) ;
bv . setUserSid ( dto . getUser_sid ( ) ) ; //"0331e5b5-9d60-11ed-87ce-525401028fe8");
//variables.put("businessSid", businessSid);
bv . setUserSid ( dto . getUser_sid ( ) ) ;
String project_sid = dto . getProject_sid ( ) ;
if ( StringUtils . isBlank ( project_sid ) ) {
return resultBean . setMsg ( "project_sid不能为空!" ) ;
@ -338,6 +337,41 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
return resultBean . success ( ) ;
}
public ResultBean submit ( SealRecordDto dto ) {
ResultBean resultBean = this . saveOrUpdateDto ( dto ) ;
boolean success = resultBean . getSuccess ( ) ;
if ( ! success ) {
return resultBean ;
}
String user_sid = dto . getUser_sid ( ) ;
// String user_sid = "4ee0138e-7b10-4ca1-a9a3-71ff94066a73";
String project_sid = dto . getProject_sid ( ) ;
dto . setUser_sid ( user_sid ) ;
if ( StringUtils . isBlank ( user_sid ) ) {
return resultBean . setMsg ( "用户sid不能为空!" ) ;
}
if ( StringUtils . isBlank ( project_sid ) ) {
return resultBean . setMsg ( "项目不能为空!" ) ;
}
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables ( ) ;
String businessSid = ( String ) resultBean . getData ( ) ;
Map < String , Object > variables = new HashMap < > ( ) ;
variables . put ( "projectName" , dto . getProject_name ( ) ) ;
bv . setProjectSid ( project_sid ) ;
bv . setBusinessSid ( businessSid ) ;
bv . setUserSid ( dto . getUser_sid ( ) ) ;
bv . setFormVariables ( variables ) ;
bv . setModelId ( ProcDefEnum . SEALSONAPPLICATION . getProDefId ( ) ) ;
ResultBean < UpdateFlowFieldVo > resultBean1 = flowableFeign . startProcess ( bv ) ;
if ( ! resultBean1 . getSuccess ( ) ) {
return resultBean1 ;
}
UpdateFlowFieldVo uff = resultBean1 . getData ( ) ;
updateFlowFiled ( uff ) ;
return resultBean . success ( ) ;
}
private int updateFlowFiled ( UpdateFlowFieldVo updateFlowFieldVo ) {
UpdateWrapper < SealRecord > uw = new UpdateWrapper < > ( ) ;
uw . eq ( "sid" , updateFlowFieldVo . getSid ( ) ) ;
@ -360,7 +394,7 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
return baseMapper . update ( null , uw ) ;
}
public ResultBean complete ( BusinessVariables bv ) {
public ResultBean completeOld ( BusinessVariables bv ) {
ResultBean rb = ResultBean . fireFail ( ) ;
String businessSid = bv . getBusinessSid ( ) ;
SealRecord sealRecord = this . fetchBySid ( businessSid ) ;
@ -447,6 +481,28 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
}
}
public ResultBean complete ( BusinessVariables bv ) {
ResultBean rb = ResultBean . fireFail ( ) ;
String businessSid = bv . getBusinessSid ( ) ;
SealRecord sealRecord = this . fetchBySid ( businessSid ) ;
String project_sid = sealRecord . getProject_sid ( ) ;
bv . setModelId ( sealRecord . getProcDefId ( ) ) ;
bv . setProjectSid ( sealRecord . getProject_sid ( ) ) ;
if ( StringUtils . isBlank ( project_sid ) ) {
return rb . setMsg ( "project_sid不能为空!" ) ;
}
if ( bv . getTaskId ( ) . equals ( sealRecord . getTaskId ( ) ) ) {
ResultBean < UpdateFlowFieldVo > resultBean = flowableFeign . handleProsess ( bv ) ;
if ( ! resultBean . getSuccess ( ) ) {
return rb . setMsg ( resultBean . getMsg ( ) ) ;
}
updateFlowFiled ( resultBean . getData ( ) ) ;
return rb . success ( ) . setData ( resultBean . getData ( ) ) ;
} else {
return rb . setMsg ( "操作失败!提交的数据不一致" ) ;
}
}
public ResultBean revokeProcess ( String userSid , String businessSid , FlowTaskVo flowTaskVo ) {
FlowTaskVo fl = new FlowTaskVo ( ) ;
BeanUtil . copyProperties ( flowTaskVo , fl ) ;
