From b7d8138083f5a49ec0c9f7dbd0a722b031d84f88 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 17:03:25 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index 6f22a3c..d77f45f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -10,10 +10,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.CompanyMapper;
-import com.doumee.dao.business.MultifileMapper;
-import com.doumee.dao.business.SolutionsMapper;
-import com.doumee.dao.business.UnionApplyMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.ApplyDetailJoinMapper;
import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
@@ -80,6 +77,8 @@
@Autowired
private SmsEmailService smsEmailService;
+ @Autowired
+ private ApplyLogMapper applyLogMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -237,13 +236,51 @@
}
PageData<UnionApply> pageData = PageData.from(unionApplyJoinMapper.selectJoinPage(page,UnionApply.class, queryWrapper));
+ if(pageData!=null && pageData.getRecords()!=null){
+ for(UnionApply model : pageData.getRecords()){
+ initStatusInfo(model);
+ }
+ }
return pageData;
+ }
+
+ private void initStatusInfo(UnionApply model) {
+ model.setStatusInfo(Constants.UnionApplyStatus.getName(Constants.formatIntegerNum(model.getStatus())));
}
@Override
public long count(UnionApply unionApply) {
QueryWrapper<UnionApply> wrapper = new QueryWrapper<>(unionApply);
return unionApplyMapper.selectCount(wrapper);
+ }
+
+ @Override
+ public UnionApply findDetailForExport(UnionApply model){
+ UnionApply insuranceApply = detail(model.getId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+
+ MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(ApplyDetail.class);
+ queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
+ queryWrapper.selectAs(Company::getName,ApplyDetail::getCompanyName);
+ queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
+ queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
+ queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
+ queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId);
+ queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId);
+ queryWrapper.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.eq( ApplyDetail::getUnionApplyId,model.getId());
+ List<ApplyDetail> detailList= applyDetailJoinMapper.selectJoinList( ApplyDetail.class, queryWrapper);
+ //鏌ヨ鏄庣粏
+ if(detailList!=null){
+ insuranceApply.setInsureNum(detailList.size());
+ insuranceApply.setApplyDetailList(detailList);
+ }
+ insuranceApply.setRemark(model.getRemark());
+ return insuranceApply;
}
@@ -256,6 +293,7 @@
.selectAs(Solutions::getName,UnionApply::getSolutionName)
.selectAs(Company::getName,UnionApply::getCompanyName)
.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.UNION_APPLY_ID = t.id ) as insureNum")
+ .select(" ( select group_concat(DISTINCT(cd.name)) from insurance_apply ad left join company cd on ad.company_id = cd.id where ad.UNION_APPLY_ID = t.id ) as companyNames")
.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId)
.leftJoin(Company.class,Company::getId,UnionApply::getCompanyId)
.eq(UnionApply::getId,applyId)
@@ -275,6 +313,7 @@
unionApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),unionApply.getStartTime())+1);
}
}
+ initStatusInfo(unionApply);
return unionApply;
}
@@ -359,6 +398,13 @@
.set(ApplyDetail::getUnionApplyId,unionApply.getId())
.in(ApplyDetail::getApplyId,saveUnionApplyDTO.getApplyIds()));
+
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD;
+ ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), null
+ ,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
+ applyLogMapper.insert(log);
+
return unionApply.getId();
}
@@ -366,16 +412,19 @@
/**
* 鍙栨秷淇濆崟鍚堝苟
- * @param id
+ * @param closeDTO
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void cancelMerge(Integer id){
+ public void cancelMerge(CloseDTO closeDTO){
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!user.getType().equals(Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
}
- UnionApply unionApply = unionApplyMapper.selectById(id);
+ if(Objects.isNull(closeDTO)||Objects.isNull(closeDTO.getId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ UnionApply unionApply = unionApplyMapper.selectById(closeDTO.getId());
if(Objects.isNull(unionApply)||!Constants.equalsInteger(unionApply.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
@@ -411,6 +460,16 @@
.set(UnionApply::getStatus,Constants.UnionApplyStatus.CLOSE.getKey())
.eq(UnionApply::getId,unionApply.getId())
);
+
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_CLOSE;
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", closeDTO.getReason());
+ ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), info
+ ,unionApply.getId(),applyLogType.getKey(),null, null);
+ applyLogMapper.insert(log);
+
+ applyLogMapper.insert(log);
}
@@ -703,10 +762,14 @@
multifile.setName(unionApplyBXDDTO.getFileName());
multifileMapper.insert(multifile);
}
+
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_TBD;
+ ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), null
+ ,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
+ applyLogMapper.insert(log);
+
}
-
-
-
}
--
Gitblit v1.9.3