From 426718fb2310abff70f54962f118f4300ead2408 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 12 一月 2025 11:30:59 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java | 121 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
index 4acc4f0..8d8d616 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
@@ -10,6 +10,8 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.InsuranceMapper;
import com.doumee.dao.business.WorktypeMapper;
+import com.doumee.dao.business.join.DuWorkTypeJoinMapper;
+import com.doumee.dao.business.join.WorktypeJoinMapper;
import com.doumee.dao.business.model.Insurance;
import com.doumee.dao.business.model.Solutions;
import com.doumee.dao.business.model.Worktype;
@@ -19,8 +21,10 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.corba.se.spi.orbutil.threadpool.Work;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +46,8 @@
private InsuranceMapper insuranceMapper;
@Autowired
private WorktypeMapper worktypeMapper;
+ @Autowired
+ private WorktypeJoinMapper worktypeJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -86,6 +92,8 @@
if(workTypeName.size() != set.size()){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝宸ョ褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
}
+ List<Worktype> saveList = new ArrayList<>();
+
for(Worktype w : worktypeList) {
if(!isNew){
//鏌ヨ淇濋櫓鍏徃涓嬫槸鍚﹀凡瀛樺湪璇ュ伐绉�
@@ -101,12 +109,13 @@
w.setInsuranceId(insurance.getId());
w.setIsdeleted(Constants.ZERO);
w.setCreator(newModel.getCreator());
- w.setCreateDate(insurance.getCreateDate());
+ w.setCreateDate(new Date());
w.setDataType(insurance.getDataType());
w.setStatus(Constants.ZERO);
w.setVersion(insurance.getVersion());
w.setSortnum(num++);
- worktypeMapper.insert(w);
+ saveList.add(w);
+// worktypeMapper.insert(w);
//鍘嗗彶鐗堟湰鐨勫伐绉嶄俊鎭�
@@ -117,8 +126,15 @@
newType.setDataType(Constants.TWO);
newType.setVersion(newModel.getVersion());
w.setSortnum(num++);
- worktypeMapper.insert(newType);
+ saveList.add(newType);
+// worktypeMapper.insert(newType);
}
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(saveList)){
+ worktypeJoinMapper.insertBatchSomeColumn(saveList);
+ }
+
+
}
private void initCreateParam(Insurance insurance) {
@@ -194,6 +210,105 @@
insuranceMapper.deleteBatchIds(ids);
}
+ /*@Override
+ public void updateById(Insurance insurance) {
+ Insurance model = findById(insurance.getId());
+ if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)
+ || !Constants.equalsInteger(model.getDataType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ //鏁版嵁鏈夋晥鎬ф牎楠�
+ initCreateParam(insurance);
+ if(insuranceMapper.selectCount(new QueryWrapper<Insurance>().lambda().eq(Insurance::getName,insurance.getName())
+ .eq(Insurance::getIsdeleted,Constants.ZERO)
+ .eq(Insurance::getDataType,Constants.ZERO)
+ .ne(Insurance::getId,insurance.getId())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"淇濋櫓鍏徃鍚嶇О宸插瓨鍦�");
+ }
+
+ LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ Insurance updateModel = new Insurance();
+ updateModel.setEditor(user.getId());
+ updateModel.setName(insurance.getName());
+ updateModel.setId(model.getId());
+ updateModel.setVersion(UUID.randomUUID().toString());
+ updateModel.setEditDate(new Date());
+ updateModel.setRemark(insurance.getRemark());
+ updateModel.setSortnum(insurance.getSortnum());
+ updateModel.setLogo(insurance.getLogo());
+ updateModel.setEnglishName(insurance.getEnglishName());
+ updateModel.setLinkName(insurance.getLinkName());
+ updateModel.setLinkPhone(insurance.getLinkPhone());
+ updateModel.setPolicy(insurance.getPolicy());
+ updateModel.setAgreement(insurance.getAgreement());
+ updateModel.setClaimsInformation(insurance.getClaimsInformation());
+ insuranceMapper.updateById(updateModel);
+
+ //濡傛灉淇敼锛屽垯浜х敓涓�涓柊鐨勫巻鍙茬増鏈� ~
+// Insurance newModel = new Insurance();
+// BeanUtils.copyProperties(model,newModel);
+// newModel.setId(null);
+// newModel.setVersion(updateModel.getVersion());
+// newModel.setCreateDate(new Date());
+// newModel.setName(updateModel.getName());
+// newModel.setBaseId(insurance.getId());
+// newModel.setDataType(Constants.TWO);
+// newModel.setLogo(insurance.getLogo());
+// newModel.setEnglishName(insurance.getEnglishName());
+// newModel.setLinkName(insurance.getLinkName());
+// newModel.setLinkPhone(insurance.getLinkPhone());
+// newModel.setPolicy(insurance.getPolicy());
+// newModel.setAgreement(insurance.getAgreement());
+// newModel.setClaimsInformation(insurance.getClaimsInformation());
+// insuranceMapper.insert(newModel);
+
+ Insurance useVersion = insuranceMapper.selectOne(new QueryWrapper<Insurance>().lambda()
+ .eq(Insurance::getBaseId,insurance.getId())
+ .eq(Insurance::getDataType,Constants.TWO)
+ .last(" limit 1")
+ );
+
+ Insurance updateUsrModel = new Insurance();
+ updateUsrModel.setEditor(user.getId());
+ updateUsrModel.setName(insurance.getName());
+ updateUsrModel.setId(useVersion.getId());
+ updateUsrModel.setVersion(UUID.randomUUID().toString());
+ updateUsrModel.setEditDate(new Date());
+ updateUsrModel.setRemark(insurance.getRemark());
+ updateUsrModel.setSortnum(insurance.getSortnum());
+ updateUsrModel.setLogo(insurance.getLogo());
+ updateUsrModel.setEnglishName(insurance.getEnglishName());
+ updateUsrModel.setLinkName(insurance.getLinkName());
+ updateUsrModel.setLinkPhone(insurance.getLinkPhone());
+ updateUsrModel.setPolicy(insurance.getPolicy());
+ updateUsrModel.setAgreement(insurance.getAgreement());
+ updateUsrModel.setClaimsInformation(insurance.getClaimsInformation());
+
+ //鍒犻櫎鎵�鏈夊伐绉嶆暟鎹�
+ worktypeMapper.delete(new UpdateWrapper<Worktype>()
+ .lambda()
+ .in(Worktype::getInsuranceId,insurance.getId())
+ );
+// insuranceMapper.update(null,new UpdateWrapper<Insurance>()
+// .lambda()
+// .eq(Insurance::getBaseId,insurance.getId())
+// .eq(Insurance::getDataType,Constants.TWO)
+// .ne(Insurance::getId,newModel.getId())
+// .set(Insurance::getDataType,Constants.ONE)
+// );
+ worktypeMapper.update(null,new UpdateWrapper<Worktype>()
+ .lambda()
+ .eq(Worktype::getInsuranceId,useVersion.getId())
+ .eq(Worktype::getDataType,Constants.TWO)
+ .set(Worktype::getDataType,Constants.ONE)
+ );
+
+ //澶勭悊宸ヤ綔淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
+ dealWorkTypeData(updateModel,useVersion,insurance.getWorktypeList(),false);
+ }*/
+
+
@Override
public void updateById(Insurance insurance) {
Insurance model = findById(insurance.getId());
--
Gitblit v1.9.3