Skip to content

T
tianjin-cement
Commit be2dfeca authored by 竹天卫's avatar 竹天卫
Browse files
Options

解决冲突

parents 26c9d30e 0cff4e7d
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 136 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java
View file @ be2dfeca
......@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
......@@ -90,7 +91,7 @@ public class ReportController {
//首页及封面导出
ReportDetailVo rts = iEntrustService.getReportDetail(entrustId);
if (rts == null){
if (rts == null) {
return;
}
Map<String, Object> beanParams = new HashMap<>(10);
......@@ -121,7 +122,7 @@ public class ReportController {
//化学工业导出
List<IndustrialReport> list1 = iEntrustService.getSampleIndustrialCheck(entrustId);
list1.forEach(this::initMapStr2AlongPro);
beanParams.put("list3",list1);
beanParams.put("list3", list1);
WordUtil.writeWordReport(rts.getProjectName() + "(报告)", "report.ftl",
beanParams, response, FileExt.EXCL);
......@@ -137,7 +138,10 @@ public class ReportController {
private void initMapStr2AlongPro(SixElementReport sixElement) {
String countResult = sixElement.getCountResults();
HashMap<String, String> countResultMap = JSON.parseObject(countResult, HashMap.class);
List<SixElementReport.Element> list = JSON.parseArray(countResult, SixElementReport.Element.class);
HashMap<String, String> countResultMap = new HashMap<>(list.size());
list.forEach(arg -> countResultMap.put(arg.getName(), arg.getValue()));
sixElement.setAl2o3("-");
sixElement.setTio2("-");
......@@ -159,16 +163,19 @@ public class ReportController {
sixElement.setSo3(countResultMap.getOrDefault(SixElementKey.SO3.getKey(), "0"));
}
private void initMapStr2AlongPro(IndustrialReport industrialReport){
private void initMapStr2AlongPro(IndustrialReport industrialReport) {
String countResult = industrialReport.getCountResults();
HashMap<String, String> countResultMap = JSON.parseObject(countResult, HashMap.class);
List<SixElementReport.Element> list = JSON.parseArray(countResult, SixElementReport.Element.class);
industrialReport.setAad(countResultMap.getOrDefault(IndustrialElementKey.Aad.getKey(),"0"));
industrialReport.setJz(countResultMap.getOrDefault(IndustrialElementKey.JZ.getKey(),"0"));
industrialReport.setMad(countResultMap.getOrDefault(IndustrialElementKey.Mad.getKey(),"0"));
industrialReport.setMjkg(countResultMap.getOrDefault(IndustrialElementKey.QnetAdMJkg.getKey(),"0"));
industrialReport.setStad(countResultMap.getOrDefault(IndustrialElementKey.StAd.getKey(),"0"));
industrialReport.setVad(countResultMap.getOrDefault(IndustrialElementKey.Vad.getKey(),"0"));
HashMap<String, String> countResultMap = new HashMap<>(list.size());
list.forEach(arg -> countResultMap.put(arg.getName(), arg.getValue()));
industrialReport.setAad(countResultMap.getOrDefault(IndustrialElementKey.Aad.getKey(), "0"));
industrialReport.setJz(countResultMap.getOrDefault(IndustrialElementKey.JZ.getKey(), "0"));
industrialReport.setMad(countResultMap.getOrDefault(IndustrialElementKey.Mad.getKey(), "0"));
industrialReport.setMjkg(countResultMap.getOrDefault(IndustrialElementKey.QnetAdMJkg.getKey(), "0"));
industrialReport.setStad(countResultMap.getOrDefault(IndustrialElementKey.StAd.getKey(), "0"));
industrialReport.setVad(countResultMap.getOrDefault(IndustrialElementKey.Vad.getKey(), "0"));
}
......@@ -194,4 +201,5 @@ public class ReportController {
return strBuilder.replace(0, 5, "").toString();
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/EntrustReport.java
View file @ be2dfeca
......@@ -72,7 +72,7 @@ public class EntrustReport {
/**
* 机械仪器名字
*/
private String equipmentName;
private String equipmentName ;
/**
* 用户id
......@@ -93,4 +93,9 @@ public class EntrustReport {
* 样品创建时间
*/
private Date sendTime;
/**
* 器械id
*/
private Integer equipmentId;
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
View file @ be2dfeca
......@@ -229,9 +229,9 @@
SELECT e.id,e.project_name,e.send_name,e.client_id,e.entrust_code,e.project_type,sscct.* FROM entrust e
RIGHT JOIN
(SELECT id,entrust_id,team_ids,method_numbers,name,scct.check_id,
scct.equipment_name,scct.user_id,create_time as send_time FROM sample s
scct.equipment_name,scct.user_id,create_time as send_time,scct.equipment_id FROM sample s
RIGHT JOIN
(SELECT check_id,equipment_name,sample_id,user_id FROM sample_check_team sct
(SELECT check_id,equipment_name,sample_id,user_id,equipment_id FROM sample_check_team sct
RIGHT JOIN
(SELECT entrust_id,id FROM sample_check WHERE entrust_id = #{entrustId}) sc
ON sct.check_id = sc.id ) scct
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleCheckMapper.xml
View file @ be2dfeca
......@@ -4,17 +4,16 @@
<select id="getSampleSixElementCheck" resultType="cn.wise.sc.cement.business.model.SixElementReport">
SELECT * FROM (SELECT count_results,entrust_id,team_group_name,sct.sample_id FROM sample_check sc
SELECT * FROM (SELECT count_results,entrust_id,team_group_name,sct.sample_id,sc.id FROM sample_check sc
LEFT JOIN
(SELECT check_id,sample_id FROM sample_check_team) sct
(SELECT check_id,sample_id FROM sample_check_team) sct
ON sct.check_id = sc.id
AND sc. is_parallel = 0
WHERE sct.sample_id IS NOT NULL AND sc.team_group_name = '六元素' ) sscct
WHERE sample_id IS NOT NULL AND sc.team_group_name = '六元素' ) sscct
RIGHT JOIN
(SELECT cement_code,sample_code,sample_form,`name` as sample_name,weight,id
(SELECT cement_code,sample_code,sample_form,`name` as sample_name,parallel_code,weight,id
FROM sample) s
ON s.id = sscct.sample_id AND entrust_id = #{entrustId}
WHERE count_results IS NOT NULL;
WHERE count_results IS NOT NULL AND s.parallel_code = cement_code;
</select>
<select id="getSampleIndustrialCheck" resultType="cn.wise.sc.cement.business.model.IndustrialReport">
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/SixElementReport.java
View file @ be2dfeca
......@@ -62,4 +62,10 @@ public class SixElementReport implements Serializable {
private String al2o3 ="";
private String tio2 ="";
@Data
public static class Element implements Serializable{
private String name;
private String value;
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ be2dfeca
......@@ -289,20 +289,20 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleTmpService.saveBatch(sampleTmpList);
}
logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "提交了委托单", null);
//消息推送
Integer approvalId = sysApprovalMapper.getApprovalId("委托评审");
if (approvalId == null) {
return BaseResponse.errorMsg("委托评审信息错误");
}
//消息推送
Integer approvalId = sysApprovalMapper.getApprovalId("委托评审");
if (approvalId == null) {
return BaseResponse.errorMsg("委托评审信息错误");
}
SysUser approvalUser = userService.getById(approvalId);
if(approvalUser == null){
if(approvalUser == null){
return BaseResponse.errorMsg("委托评审信息错误");
}
BaseResponse wrapper = userMessageService.sendMessage(approvalId, "您有一条新的委托单申请等待评审",entrust.getId(), SysUserMessage.MessageType.ENTRUST);
if(wrapper.getCode() != 200){
return wrapper;
}
BaseResponse wrapper = userMessageService.sendMessage(approvalId, "您有一条新的委托单申请等待评审",entrust.getId(), SysUserMessage.MessageType.ENTRUST);
if(wrapper.getCode() != 200){
return wrapper;
}
//发送企业微信消息内容
if(StringUtils.isNotBlank(approvalUser.getWxId())){
String content="你好！"+loginUser.getName()+"向您申请了一条委托，请前往\n" +
......@@ -1746,7 +1746,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (sampleCheckList != null && sampleCheckList.size() > 0) { //参与校核计算的
SampleCheck sampleCheck = sampleCheckList.get(0);
SampleCheckVo sampleCheckVo = new SampleCheckVo();
sampleCheckVo.setId(sampleCheck.getId());
sampleCheckVo.setId(sampleCheck.getId());
sampleCheckVo.setEntrustId(entrust.getId());
sampleCheckVo.setSampleName(sampleOne.getName());
sampleCheckVo.setCementCode(cementCode);
......@@ -1762,7 +1762,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (sampleCheckTeamList != null && sampleCheckTeamList.size() > 0) {
for (SampleCheckTeam sampleCheckTeam : sampleCheckTeamList) {
SampleCheckTeamVo sampleCheckTeamVo = new SampleCheckTeamVo();
sampleCheckTeamVo.setId(sampleCheckTeam.getId());
sampleCheckTeamVo.setId(sampleCheckTeam.getId());
sampleCheckTeamVo.setCheckId(sampleCheck.getId());
sampleCheckTeamVo.setSampleId(sampleCheckTeam.getSampleId());
sampleCheckTeamVo.setSampleId(sampleCheckTeam.getSampleId());
......@@ -1882,21 +1882,21 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (query.getTeamGroupId() == null || StringUtils.isEmpty(query.getTeamGroupName())) {
return BaseResponse.errorMsg("请选择检测组");
}
SampleCheck check = null;
SampleCheck check = null;
//保存校核表信息
if(query.getId() == null){
check = new SampleCheck();
check.setEntrustId(entrust.getId())
.setCementCode(query.getCementCode())
.setTeamGroupId(query.getTeamGroupId())
.setTeamGroupName(query.getTeamGroupName())
.setCountResults(null)
.setCountError(null)
.setIsParallel(query.getIsParallel())
.setCreateTime(LocalDateTime.now());
sampleCheckMapper.insert(check);
check = new SampleCheck();
check.setEntrustId(entrust.getId())
.setCementCode(query.getCementCode())
.setTeamGroupId(query.getTeamGroupId())
.setTeamGroupName(query.getTeamGroupName())
.setCountResults(null)
.setCountError(null)
.setIsParallel(query.getIsParallel())
.setCreateTime(LocalDateTime.now());
sampleCheckMapper.insert(check);
}else{
check = sampleCheckMapper.selectById(query.getId());
check = sampleCheckMapper.selectById(query.getId());
}
//返回信息：样品的计算结果集合
Map<String, Object> countResultMap = new HashMap<>();
......@@ -1931,40 +1931,40 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
String resultMap_String = JSON.toJSON(resultMap_jsonArray).toString();
System.out.println(resultMap_String);
//保存校核检测组检测项信息
SampleCheckTeam sampleCheckTeam = null;
if(sampleQuery.getId() == null){
SampleCheckTeam sampleCheckTeam = null;
if(sampleQuery.getId() == null){
sampleCheckTeam = new SampleCheckTeam();
sampleCheckTeam.setCheckId(check.getId())
.setSampleId(sampleQuery.getSmapleId())
.setParallelCode(sampleQuery.getParallelCode())
.setUserId(sampleQuery.getUserId())
.setEquipmentId(sampleQuery.getEquipmentId())
.setEquipmentName(sampleQuery.getEquipmentName())
.setInputResult(inputResult_String)
.setCountResult(resultMap_String)
.setCreateTime(LocalDateTime.now());
sampleCheckTeamMapper.insert(sampleCheckTeam);
//添加设备使用记录 设备使用记录表 equipment_use
EquipmentUse equipmentUse2 = new EquipmentUse();
SysUser sysUser = userService.getById(sampleCheckTeam.getUserId());
equipmentUse2.setEquipmentId(sampleCheckTeam.getEquipmentId())
.setUserId(sampleCheckTeam.getUserId())
.setUserName(sysUser.getName())
.setUseDate(LocalDate.now())
.setProjectId(entrust.getProjectId())
.setProjectName(entrust.getProjectName())
.setProjectCode(entrust.getProjectCode())
.setTestItem(check.getTeamGroupName())
.setCreateTime(LocalDateTime.now())
.setRemark("委托派发-数据校核");
equipmentUseMapper.insert(equipmentUse2);
}else{
sampleCheckTeam = sampleCheckTeamMapper.selectById(sampleQuery.getId());
sampleCheckTeam.setCheckId(check.getId())
sampleCheckTeam.setCheckId(check.getId())
.setSampleId(sampleQuery.getSmapleId())
.setParallelCode(sampleQuery.getParallelCode())
.setUserId(sampleQuery.getUserId())
.setEquipmentId(sampleQuery.getEquipmentId())
.setEquipmentName(sampleQuery.getEquipmentName())
.setInputResult(inputResult_String)
.setCountResult(resultMap_String);
sampleCheckTeamMapper.updateById(sampleCheckTeam);
}
.setCountResult(resultMap_String)
.setCreateTime(LocalDateTime.now());
sampleCheckTeamMapper.insert(sampleCheckTeam);
//添加设备使用记录 设备使用记录表 equipment_use
EquipmentUse equipmentUse2 = new EquipmentUse();
SysUser sysUser = userService.getById(sampleCheckTeam.getUserId());
equipmentUse2.setEquipmentId(sampleCheckTeam.getEquipmentId())
.setUserId(sampleCheckTeam.getUserId())
.setUserName(sysUser.getName())
.setUseDate(LocalDate.now())
.setProjectId(entrust.getProjectId())
.setProjectName(entrust.getProjectName())
.setProjectCode(entrust.getProjectCode())
.setTestItem(check.getTeamGroupName())
.setCreateTime(LocalDateTime.now())
.setRemark("委托派发-数据校核");
equipmentUseMapper.insert(equipmentUse2);
}else{
sampleCheckTeam = sampleCheckTeamMapper.selectById(sampleQuery.getId());
sampleCheckTeam.setCheckId(check.getId())
.setInputResult(inputResult_String)
.setCountResult(resultMap_String);
sampleCheckTeamMapper.updateById(sampleCheckTeam);
}
}
countResultMap.put("resultMapList", resultMapList);
//计算最终计算结果 和 结果误差值
......@@ -1974,98 +1974,98 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (name.equals("L.O.I")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("SiO2")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name, (groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))?
map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))?
map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Al2O3+TiO2")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Al2O3")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Fe2O3")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("CaO")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("MgO")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("TiO2")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("K2O")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Na2O")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("SO3")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("Cl")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("合量")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("KH")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("SM")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else if (name.equals("AM")) {
for(Map<String, String> map : resultMapList){
groupMap.put(name,(groupMap == null || groupMap.size()==0 ||
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
groupMap.get(name) == null || groupMap.get(name).equals(""))
?map.get(name):groupMap.get(name)+","+map.get(name));
}
} else {
groupMap.put(name, "0");
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanTrainingServiceImpl.java
View file @ be2dfeca
......@@ -94,35 +94,15 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
if (save) {
Integer planId = cama.getId();
//todo 培训关联表对象 ==>plant + 基本用户信息
//拆分用户id
String userIds = query.getUserIds();
String[] split = userIds.split("、");
List<PlanPeople> batchAdd = new ArrayList<>();
//为每个用户id创建关联表信息s
for (String userId : split) {
Integer id = Integer.parseInt(userId);
UserVo user = sysUserMapper.getById(id);
PlanPeople planPeople = new PlanPeople();
planPeople.setPlanId(planId);
planPeople.setUserId(user.getId());
planPeople.setName(user.getName());
planPeople.setAccount(user.getUsername());
planPeople.setGroupId(user.getGroupId());
batchAdd.add(planPeople);
cama.setPlanObject(cama.getPlanObject() + user.getName() + "、");
}
//传的GroupIds
String groupIds = query.getGroupIds();
String[] split1 = groupIds.split("、");
List<PlanPeople> batchAdd1 = new ArrayList<>();
for (String groupId : split1) {
int gpId = Integer.parseInt(groupId);
QueryWrapper<SysUser> qw = new QueryWrapper<>();
qw.eq("group_id", gpId);
List<SysUser> sysUsers = sysUserMapper.selectList(qw);
for (SysUser user : sysUsers) {
if (query.getUserIds()!=null) {
//拆分用户id
String userIds = query.getUserIds();
String[] split = userIds.split("、");
//为每个用户id创建关联表信息s
for (String userId : split) {
Integer id = Integer.parseInt(userId);
UserVo user = sysUserMapper.getById(id);
PlanPeople planPeople = new PlanPeople();
planPeople.setPlanId(planId);
planPeople.setUserId(user.getId());
......@@ -131,6 +111,31 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
planPeople.setGroupId(user.getGroupId());
batchAdd.add(planPeople);
cama.setPlanObject(cama.getPlanObject() + user.getName() + "、");
}
}
if (query.getGroupIds()!=null) {
//传的GroupIds
String groupIds = query.getGroupIds();
String[] split1 = groupIds.split("、");
List<PlanPeople> batchAdd1 = new ArrayList<>();
for (String groupId : split1) {
int gpId = Integer.parseInt(groupId);
QueryWrapper<SysUser> qw = new QueryWrapper<>();
qw.eq("group_id", gpId);
List<SysUser> sysUsers = sysUserMapper.selectList(qw);
for (SysUser user : sysUsers) {
PlanPeople planPeople = new PlanPeople();
planPeople.setPlanId(planId);
planPeople.setUserId(user.getId());
planPeople.setName(user.getName());
planPeople.setAccount(user.getUsername());
planPeople.setGroupId(user.getGroupId());
batchAdd.add(planPeople);
cama.setPlanObject(cama.getPlanObject() + user.getName() + "、");
}
}
}
iPlantPeopleService.saveBatch(batchAdd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment