|
|
@@ -110,9 +110,6 @@ public class QpQualificationApplyController extends BaseController
|
|
|
|
|
|
String type="lead";
|
|
|
//查询当前用户负责的实验室集合
|
|
|
- /*map.put("userId",sysUser.getUserId());
|
|
|
- R<Object> sub = remoteLaboratoryService.mySubjectList(map);
|
|
|
- List<Map> listSub = (List<Map>) sub.getData();*/
|
|
|
List<Map<String, Object>> listSubject = qpQualificationApplyService.selectMySubject(sysUser.getUserId());
|
|
|
List<Long> subIds = Optional.ofNullable(listSubject).orElseGet(Collections::emptyList).stream()
|
|
|
.map(a->(Long.parseLong(a.get("id")+""))).collect(Collectors.toList());
|
|
|
@@ -126,7 +123,6 @@ public class QpQualificationApplyController extends BaseController
|
|
|
applyVO.setZgBoolean(true);
|
|
|
applyVO.setYqBoolean(true);
|
|
|
applyVO.setIds(null);
|
|
|
- //applyVO.setDeptId(sysUser.getDeptId());
|
|
|
type="center";
|
|
|
}else{
|
|
|
applyVO.setZgBoolean(false);
|
|
|
@@ -188,8 +184,6 @@ public class QpQualificationApplyController extends BaseController
|
|
|
public void export(HttpServletResponse response, QpQualificationApplyVO qpQualificationApply) throws IOException
|
|
|
{
|
|
|
//获取当前登录用户信息
|
|
|
- //SysUser sysUser = tokenService.getLoginUser().getSysUser();
|
|
|
- //qpQualificationApply.setApplyUserid(sysUser.getUserId());//当前登陆人申请数据
|
|
|
qpQualificationApply.setCenterAuditStatus(1);//审核通过的数据
|
|
|
qpQualificationApply.setRemark("100");
|
|
|
List<QpQualificationApplyVO> list = qpQualificationApplyService.selectQpQualificationApplyList(qpQualificationApply);
|
|
|
@@ -237,11 +231,6 @@ public class QpQualificationApplyController extends BaseController
|
|
|
QpQualificationApply qpQualificationApply =qpQualificationApplyService.selectQpQualificationApplyById(id);
|
|
|
map.put("apply",qpQualificationApply);
|
|
|
|
|
|
- //申请气瓶详情
|
|
|
- /*QpQualificationApplyDetailVO detailVO = new QpQualificationApplyDetailVO();
|
|
|
- detailVO.setQualificateApplyId(qpQualificationApply.getId());
|
|
|
- List<QpQualificationApplyDetailVO> airBottlelist = qpQualificationApplyDetailService.selectQpQualificationApplyDetailListRelation(detailVO);
|
|
|
- */
|
|
|
List<QpAirGoodsConfigRelationVo> airBottlelist = qpQualificationApplyDetailService.selectQpQualificationApplyDetailListRelation(qpQualificationApply.getId());
|
|
|
map.put("airBottlelist",airBottlelist);
|
|
|
|
|
|
@@ -282,23 +271,14 @@ public class QpQualificationApplyController extends BaseController
|
|
|
//待审核或者驳回
|
|
|
if(0 == qpQualificationApply.getLeadAuditStatus() || 2 == qpQualificationApply.getLeadAuditStatus()){
|
|
|
//查询是否有审核资格
|
|
|
- /*QpFlowDetailVO qpFlowDetail = new QpFlowDetailVO();
|
|
|
- qpFlowDetail.setUserType(1L);//1实验室 2实验中心
|
|
|
- qpFlowDetail.setUserIds(sysUser.getUserId());//登录人id
|
|
|
- qpFlowDetail.setFlowType(1);//资格申请
|
|
|
- List<QpFlowDetailVO> flowDetailList = qpFlowDetailService.selectQpFlowDetailList(qpFlowDetail);
|
|
|
- if(flowDetailList.size()>0){
|
|
|
- audit=true;
|
|
|
- }*/
|
|
|
if(sysUser.getUserId().equals(qpQualificationApply.getAdminId()) ) {
|
|
|
audit=true;
|
|
|
}
|
|
|
}else if(1 == qpQualificationApply.getLeadAuditStatus()){
|
|
|
//查询登录用户是否有实验中心审核资格
|
|
|
QpFlowDetailVO qpFlowDetail = new QpFlowDetailVO();
|
|
|
- //qpFlowDetail.setUserType(2L);//1实验室 2实验中心
|
|
|
qpFlowDetail.setUserId(sysUser.getUserId());//登录人id
|
|
|
- //qpFlowDetail.setFlowType(1);//资格申请
|
|
|
+
|
|
|
List<QpFlowDetailVO> flowDetailList = qpFlowDetailService.selectQpFlowDetailList(qpFlowDetail);
|
|
|
if(flowDetailList.size()>0){
|
|
|
audit=true;
|
|
|
@@ -308,10 +288,6 @@ public class QpQualificationApplyController extends BaseController
|
|
|
map.put("audit",audit);
|
|
|
|
|
|
//申请气瓶详情
|
|
|
- /*QpQualificationApplyDetailVO detailVO = new QpQualificationApplyDetailVO();
|
|
|
- detailVO.setQualificateApplyId(qpQualificationApply.getId());
|
|
|
- List<QpQualificationApplyDetailVO> airBottlelist = qpQualificationApplyDetailService.selectQpQualificationApplyDetailListRelation(detailVO);
|
|
|
- */
|
|
|
List<QpAirGoodsConfigRelationVo> airBottlelist = qpQualificationApplyDetailService.selectQpQualificationApplyDetailListRelation(qpQualificationApply.getId());
|
|
|
map.put("airBottlelist",airBottlelist);
|
|
|
|
|
|
@@ -392,9 +368,6 @@ public class QpQualificationApplyController extends BaseController
|
|
|
|
|
|
//消息发送
|
|
|
QpQualificationApplyVO qualificationApply = qpQualificationApplyService.selectQpQualificationApplyById(qpQualificationApply.getId());
|
|
|
- /*checkType "审核类型 1:资格申请 2:用气申请"),
|
|
|
- checkStatus "审核状态 1:通过 2:已驳回"),
|
|
|
- checkTime "审核时间")*/
|
|
|
remoteMessageService.check(qualificationApply.getUserId(),1,qpQualificationApply.getCenterAuditStatus(),new Date(),qualificationApply.getId());
|
|
|
|
|
|
return ResultData.result(qpQualificationApplyService.updateQpQualificationApply(qpQualificationApply));
|
|
|
@@ -432,9 +405,6 @@ public class QpQualificationApplyController extends BaseController
|
|
|
if(2==qpQualificationApply.getLeadAuditStatus()){
|
|
|
//实验室审核驳回时 消息发送
|
|
|
QpQualificationApplyVO qualificationApply = qpQualificationApplyService.selectQpQualificationApplyById(qpQualificationApply.getId());
|
|
|
- /*checkType "审核类型 1:资格申请 2:用气申请"),
|
|
|
- checkStatus "审核状态 1:通过 2:已驳回"),
|
|
|
- checkTime "审核时间")*/
|
|
|
remoteMessageService.check(qualificationApply.getUserId(),1,2,new Date(),qualificationApply.getId());
|
|
|
}
|
|
|
return ResultData.result(qpQualificationApplyService.updateQpQualificationApply(qpQualificationApply));
|