|
|
@ -14,6 +14,7 @@ import com.qs.serve.common.util.PageUtil; |
|
|
|
import com.qs.serve.modules.qms.entity.QmsForm; |
|
|
|
import com.qs.serve.modules.qms.entity.QmsGroupScope; |
|
|
|
import com.qs.serve.modules.qms.entity.bo.QmsGroupBo; |
|
|
|
import com.qs.serve.modules.qms.entity.bo.QmsHastenBo; |
|
|
|
import com.qs.serve.modules.qms.service.QmsFormService; |
|
|
|
import com.qs.serve.modules.qms.service.QmsGroupScopeService; |
|
|
|
import com.qs.serve.modules.sys.entity.SysDept; |
|
|
@ -118,7 +119,7 @@ public class QmsGroupController { |
|
|
|
qmsGroup.setFormContext(qmsForm.getFormContext()); |
|
|
|
qmsGroup.setVersion(qmsForm.getVersion()); |
|
|
|
qmsGroupService.updateById(qmsGroup); |
|
|
|
qmsGroupScopeService.removeById(qmsGroup.getFormId()); |
|
|
|
qmsGroupScopeService.removeByGroupId(qmsGroup.getId()); |
|
|
|
qmsGroupScopeService.saveByBo(qmsGroup.getId(),param); |
|
|
|
return R.ok(); |
|
|
|
} |
|
|
@ -137,11 +138,39 @@ public class QmsGroupController { |
|
|
|
if(qmsGroup.getPublishState().equals(1)){ |
|
|
|
return R.error("请勿重新发布"); |
|
|
|
} |
|
|
|
//TODO 发布
|
|
|
|
qmsGroup.setPublishState(1); |
|
|
|
qmsGroupService.updateById(qmsGroup); |
|
|
|
this.qmsGroupScopeService.publish(groupId); |
|
|
|
//todo 发送推送
|
|
|
|
return R.ok(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 催办 |
|
|
|
* @param hastenBo |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@LimitSubmit |
|
|
|
@PostMapping("/hasten") |
|
|
|
@SysLog(module = SystemModule.QUESTION, title = "发布组", biz = BizType.UPDATE) |
|
|
|
public R<?> hasten(@RequestBody @Valid QmsHastenBo hastenBo){ |
|
|
|
QmsGroup qmsGroup = qmsGroupService.getById(hastenBo.getGroupId()); |
|
|
|
if(qmsGroup.getPublishState().equals(0)){ |
|
|
|
return R.error("未发布不可以催办"); |
|
|
|
} |
|
|
|
LambdaQueryWrapper<QmsGroupScope> lqw = new LambdaQueryWrapper<>(); |
|
|
|
lqw.eq(QmsGroupScope::getGroupId,hastenBo.getGroupId()); |
|
|
|
lqw.eq(QmsGroupScope::getFinished,0); |
|
|
|
lqw.ne(QmsGroupScope::getScopeType,0); |
|
|
|
lqw.ne(QmsGroupScope::getScopeType,2); |
|
|
|
List<QmsGroupScope> groupScopes = qmsGroupScopeService.list(lqw); |
|
|
|
List<String> userIds = groupScopes.stream() |
|
|
|
.map(QmsGroupScope::getScopeValue) |
|
|
|
.distinct().collect(Collectors.toList()); |
|
|
|
//todo 根据userId加载微信用户进行推送
|
|
|
|
return R.ok(); |
|
|
|
} |
|
|
|
|
|
|
|
//TODO 催办
|
|
|
|
|
|
|
|
/** |
|
|
|
* 催办列表 |
|
|
@ -155,11 +184,14 @@ public class QmsGroupController { |
|
|
|
LambdaQueryWrapper<QmsGroupScope> lqw = new LambdaQueryWrapper<>(); |
|
|
|
if(finished!=null){ |
|
|
|
lqw.eq(QmsGroupScope::getFinished,finished); |
|
|
|
}else { |
|
|
|
lqw.ne(QmsGroupScope::getFinished,-1); |
|
|
|
} |
|
|
|
if(groupId!=null){ |
|
|
|
lqw.eq(QmsGroupScope::getGroupId,groupId); |
|
|
|
} |
|
|
|
lqw.in(QmsGroupScope::getScopeType,1,3); |
|
|
|
lqw.ne(QmsGroupScope::getScopeType,0); |
|
|
|
lqw.ne(QmsGroupScope::getScopeType,2); |
|
|
|
PageUtil.startPage(); |
|
|
|
List<QmsGroupScope> groupScopes = qmsGroupScopeService.list(lqw); |
|
|
|
List<SysUserSimpleVo> list = new ArrayList<>(); |
|
|
|