初始化 法规清单的 当前项目状态评估数据接口 (法规清单在项目状态评估表中没有的)
This commit is contained in:
+1
@@ -155,6 +155,7 @@ public class ShiroConfig {
|
|||||||
filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口,事件订阅配置。
|
filterChainDefinitionMap.put("/lark/larkEventSubscriptionConfig", "anon"); //飞书调用接口,事件订阅配置。
|
||||||
filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口,卡片消息配置。
|
filterChainDefinitionMap.put("/lark/larkCardMessageConfig", "anon"); //飞书调用接口,卡片消息配置。
|
||||||
filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
|
filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
|
||||||
|
filterChainDefinitionMap.put("/project/projectTaskInventoryConditionAssessmentEO/initConditionAssessment", "anon"); // 初始化项目当前状态数据接口
|
||||||
|
|
||||||
// 添加自己的过滤器并且取名为jwt
|
// 添加自己的过滤器并且取名为jwt
|
||||||
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
|
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
|
||||||
|
|||||||
+11
@@ -195,4 +195,15 @@ public class ConditionAssessmentEOController extends JeroController<ConditionAss
|
|||||||
public Result<?> addOrUpdateConditionAssessmentBatch(@RequestBody ConditionAssessmentVO conditionAssessmentVO) {
|
public Result<?> addOrUpdateConditionAssessmentBatch(@RequestBody ConditionAssessmentVO conditionAssessmentVO) {
|
||||||
return conditionAssessmentEOService.addOrUpdateBatch(conditionAssessmentVO);
|
return conditionAssessmentEOService.addOrUpdateBatch(conditionAssessmentVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 初始化当前项目状态评估数据 (法规清单在项目状态评估表中没有的)
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "任务清单-项目状态评估表-初始化当前项目状态评估数据")
|
||||||
|
@ApiOperation(value="任务清单-项目状态评估表-初始化当前项目状态评估数据", notes="任务清单-项目状态评估表-初始化当前项目状态评估数据")
|
||||||
|
@GetMapping(value = "/initConditionAssessment")
|
||||||
|
public Result<?> initConditionAssessment(@RequestParam Map<String,Object> params) {
|
||||||
|
this.conditionAssessmentEOService.initConditionAssessment(params);
|
||||||
|
return Result.OK("初始化数据成功!");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -98,4 +98,10 @@ public interface IConditionAssessmentEOService extends IService<ConditionAssessm
|
|||||||
* @param conditionAssessmentVO
|
* @param conditionAssessmentVO
|
||||||
*/
|
*/
|
||||||
Result<?> addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO);
|
Result<?> addOrUpdateBatch(ConditionAssessmentVO conditionAssessmentVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 初始化项目当前状态数据
|
||||||
|
* @param params
|
||||||
|
*/
|
||||||
|
void initConditionAssessment(Map<String, Object> params);
|
||||||
}
|
}
|
||||||
|
|||||||
+45
@@ -5,14 +5,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.common.system.vo.LoginUser;
|
import com.jero.common.system.vo.LoginUser;
|
||||||
import com.jero.modules.project.entity.ConditionAssessmentEO;
|
import com.jero.modules.project.entity.ConditionAssessmentEO;
|
||||||
|
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
|
||||||
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
|
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
|
||||||
|
import com.jero.modules.project.enums.CurrentProjectStatusEnum;
|
||||||
import com.jero.modules.project.enums.ProjectRoleEnum;
|
import com.jero.modules.project.enums.ProjectRoleEnum;
|
||||||
import com.jero.modules.project.mapper.ConditionAssessmentEOMapper;
|
import com.jero.modules.project.mapper.ConditionAssessmentEOMapper;
|
||||||
import com.jero.modules.project.service.IConditionAssessmentEOService;
|
import com.jero.modules.project.service.IConditionAssessmentEOService;
|
||||||
|
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
|
||||||
import com.jero.modules.project.vo.ConditionAssessmentVO;
|
import com.jero.modules.project.vo.ConditionAssessmentVO;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -27,6 +31,9 @@ import java.util.stream.Collectors;
|
|||||||
@Service
|
@Service
|
||||||
public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAssessmentEOMapper,ConditionAssessmentEO> implements IConditionAssessmentEOService {
|
public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAssessmentEOMapper,ConditionAssessmentEO> implements IConditionAssessmentEOService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IProjectLawsInventoryEOService projectLawsInventoryEOService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 保存
|
* 保存
|
||||||
*
|
*
|
||||||
@@ -317,4 +324,42 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
|
|||||||
|
|
||||||
return Result.ok();
|
return Result.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void initConditionAssessment(Map<String, Object> params) {
|
||||||
|
String projectLibraryId = (String) params.get("projectLibraryId");
|
||||||
|
|
||||||
|
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
|
||||||
|
if(StringUtils.isNotEmpty(projectLibraryId)){
|
||||||
|
//如果项目库id不为空,只处理这一个项目下的数据。
|
||||||
|
lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
|
||||||
|
}
|
||||||
|
List<ProjectLawsInventoryEO> lawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryQueryWrapper);
|
||||||
|
if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){
|
||||||
|
QueryWrapper<ConditionAssessmentEO> conditionAssessmentQueryWrapper = new QueryWrapper<>();
|
||||||
|
List<ConditionAssessmentEO> conditionAssessmentEOList = this.baseMapper.selectList(conditionAssessmentQueryWrapper);
|
||||||
|
|
||||||
|
//过滤出,没有项目当前状态数据的法规清单数据
|
||||||
|
lawsInventoryEOList = lawsInventoryEOList.stream().filter(lawsInventory -> {
|
||||||
|
boolean flag = true;
|
||||||
|
for (ConditionAssessmentEO conditionAssessmentEO : conditionAssessmentEOList) {
|
||||||
|
if(StringUtils.equals(lawsInventory.getId(),conditionAssessmentEO.getProjectLawsInventoryId())){
|
||||||
|
flag = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return flag;
|
||||||
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
|
if(CollectionUtils.isNotEmpty(lawsInventoryEOList)){
|
||||||
|
for (ProjectLawsInventoryEO lawsInventory : lawsInventoryEOList) {
|
||||||
|
ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO();
|
||||||
|
conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
|
||||||
|
conditionAssessmentEO.setProjectLawsInventoryId(lawsInventory.getId());
|
||||||
|
conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue());
|
||||||
|
this.addOrUpdate(conditionAssessmentEO);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1519,7 +1519,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
|||||||
list1.add("</text>");
|
list1.add("</text>");
|
||||||
mapTemp.put("pre_tags", list);
|
mapTemp.put("pre_tags", list);
|
||||||
mapTemp.put("post_tags", list1);
|
mapTemp.put("post_tags", list1);
|
||||||
mapTemp.put("fragment_size", 280);//高亮字段内容长度,去除html样式标签,统计字数,设置为200
|
mapTemp.put("fragment_size", 500);//高亮字段内容长度,去除html样式标签,统计字数,设置为200
|
||||||
mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段
|
mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段
|
||||||
mapTemp.put("type", "plain");
|
mapTemp.put("type", "plain");
|
||||||
mapHighlight.put(key, mapTemp);
|
mapHighlight.put(key, mapTemp);
|
||||||
|
|||||||
Reference in New Issue
Block a user