toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2026-02-25 14:01:37 +08:00
parent fd2ccc404a 6d5258c89e
commit 5058d92b37
9 changed files with 483 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/src/main/java/com/sdm/project/dao/SimulationProjectMapper.java
View File

@@ -6,6 +6,8 @@ import com.sdm.common.entity.resp.project.TaskNodeExtraPo;
import com.sdm.project.model.bo.*;
import com.sdm.project.model.po.*;
import com.sdm.project.model.req.ProjectTreeReq;
import com.sdm.project.model.req.SpdmAnalysisPerformanceListReq;
import com.sdm.project.model.req.SpdmAnalysisRunListReq;
import com.sdm.project.model.req.TaskEditNodeReq;
import org.apache.ibatis.annotations.*;
@@ -163,20 +165,18 @@ public interface SimulationProjectMapper {
void deleteTaskMemberList(@Param("taskIdList") List<String> taskIdList);
List<PerformanceNodePo> queryPerformanceNodeByNodeIdList(@Param("taskIdList") List<String> taskIdList,@Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("name") String name);
List<PerformanceNodePo> queryPerformanceNodeByNodeIdList(@Param("taskIdList") List<String> taskIdList, @Param("req")SpdmAnalysisPerformanceListReq req);
List<PerformanceNodeExtraPo> queryPerformanceNodeExtrasByNodeIdList(@Param("taskIdList") List<String> taskIdList);
// List<SpdmTaskVo> getTaskList(@Param("tenantId") String tenantId,@Param("taskName") String taskName, @Param("taskStatus") Integer taskStatus, @Param("achieveStatus") Integer achieveStatus, @Param("nodeIdList") List<String> nodeIdList);
List<TaskRunPo> queryRunListByNodeIdList(@Param("taskIdList") List<String> taskIdList,@Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("name") String name);
List<TaskRunPo> queryRunListByNodeIdList(@Param("taskIdList") List<String> taskIdList,@Param("req") SpdmAnalysisRunListReq req);
List<ProjectNodePo> getNodeListByTag(@Param("req") ProjectTreeReq projectTreeReq);
List<TaskNodePo> getTaskListByTag(@Param("req") ProjectTreeReq taskTreeReq);
void getUserGroupProjectStatistics();
List<RunNodePo> getRunListByNodeIdList(@Param("taskIdList") List<String> taskIdList);
List<SimulationNodeResp> querySimulationNodeByUuids(@Param("list")List<String> uuids);

2
project/src/main/java/com/sdm/project/model/entity/SimulationRun.java
View File

@@ -91,7 +91,7 @@ public class SimulationRun implements Serializable {
@ApiModelProperty(value = "英文名")
@TableField("englishName")
private Long englishName;
private String englishName;
@Schema(description= "创建者ID")
@TableField("creator")

31
project/src/main/java/com/sdm/project/model/req/SpdmAnalysisPerformanceListReq.java
View File

@@ -1,8 +1,10 @@
package com.sdm.project.model.req;
import com.baomidou.mybatisplus.annotation.TableField;
import com.sdm.common.entity.ExportExcelFormat;
import com.sdm.common.entity.pojo.BaseEntity;
import com.sdm.common.entity.req.task.TaskExportExcelParam;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -58,4 +60,33 @@ public class SpdmAnalysisPerformanceListReq extends BaseEntity {
*/
private TaskExportExcelParam params;
private String englishName;
private String nodeCode;
private String poolName;
private String performanceType;
private String unit;
private String targetValue;
private String lowValue;
private String highValue;
private String method;
private String completeStatus;
private String resultValue;
private String description;
private String taskName;
private String standard;
}

37
project/src/main/java/com/sdm/project/model/req/SpdmAnalysisRunListReq.java
View File

@@ -1,12 +1,16 @@
package com.sdm.project.model.req;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.sdm.common.entity.ExportExcelFormat;
import com.sdm.common.entity.pojo.BaseEntity;
import com.sdm.common.entity.req.task.TaskExportExcelParam;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
@@ -57,4 +61,37 @@ public class SpdmAnalysisRunListReq extends BaseEntity {
* 导出任务的可选查询参数
*/
private TaskExportExcelParam params;
private Integer type;
private String taskId;
private String flowTemplate;
private Integer status;
private Integer totalStep;
private Integer currentStep;
private String currentStepName;
private Integer achieveStatus;
private String description;
private String parentId;
private Integer isPersonalTemplate;
private String englishName;
public String processDefinitionId;
private String flowInstanceId;
private String reportTemplate;
private String reportContent;
}

60
project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java
View File

@@ -1,8 +1,12 @@
package com.sdm.project.model.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.sdm.common.entity.ExportExcelFormat;
import com.sdm.common.entity.pojo.BaseEntity;
import com.sdm.common.entity.req.task.TaskExportExcelParam;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -88,4 +92,60 @@ public class SpdmAnalysisTaskListReq extends BaseEntity {
*/
private TaskExportExcelParam params;
private String taskCode;
private Integer days;
private Integer realDays;
private String standard;
private Integer status;
private String achieveStatus;
private Integer progress;
private String exeStatus;
private String confidence;
private String analyseTarget;
private String analyseSoftware;
private Integer approvalStatus;
private String comfirmStatus;
private String description;
private Float difficult;
private String department;
private String sectionName;
private String groupName;
private String bCapacity;
private String flowTemplate;
private String englishName;
private String demandId;
private String cidFlowId;
private Long imageFileId;
private Integer expStatus;
private String discipline;
private String reportTemplate;
private String reportContent;
}

39
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -1546,7 +1546,7 @@ public class TaskServiceImpl implements ITaskService {
}
List<String> taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList();
List<PerformanceNodePo> performanceNodePoList = projectMapper.queryPerformanceNodeByNodeIdList(taskIdList, req.getBeginTime(), req.getEndTime(), req.getName());
List<PerformanceNodePo> performanceNodePoList = projectMapper.queryPerformanceNodeByNodeIdList(taskIdList, req);
if (CollectionUtils.isEmpty(performanceNodePoList)) {
log.error("指标查询中，未查询到指标1");
return SdmResponse.success(new ArrayList<>());
@@ -1575,6 +1575,12 @@ public class TaskServiceImpl implements ITaskService {
}
List<TaskNodeMemberPo> eachTaskNodeMemberPoList;
SpdmAnalysisTaskVo eachTaskVo;
SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder()
.userIds(taskNodeMemberPoList.stream().map(TaskNodeMemberPo::getUserId).toList()).build());
Map<Long, String> cidUserMap = new HashMap<>();
if (cidUserResp != null && cidUserResp.isSuccess() && CollectionUtils.isNotEmpty(cidUserResp.getData())) {
cidUserMap = cidUserResp.getData().stream().collect(Collectors.toMap(CIDUserResp::getUserId, CIDUserResp::getNickname));
}
for (PerformanceNodePo performanceNodePo : performanceNodePoList) {
eachTaskVo = taskMap.get(performanceNodePo.getTaskId());
if (ObjectUtils.isEmpty(eachTaskVo)) {
@@ -1587,12 +1593,14 @@ public class TaskServiceImpl implements ITaskService {
performanceNodePo.setTaskName(eachTaskVo.getTaskName());
eachTaskNodeMemberPoList = memberMap.get(eachTaskVo.getUuid());
if (CollectionUtils.isNotEmpty(eachTaskNodeMemberPoList)) {
SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder()
.userIds(eachTaskNodeMemberPoList.stream().map(TaskNodeMemberPo::getUserId).toList()).build());
if (cidUserResp == null || !cidUserResp.isSuccess() || CollectionUtils.isEmpty(cidUserResp.getData())) {
continue;
List<String> nickNameList = new ArrayList<>();
for (TaskNodeMemberPo taskNodeMemberPo : eachTaskNodeMemberPoList) {
String nickName = cidUserMap.get(taskNodeMemberPo.getUserId());
if (StringUtils.isBlank(nickName)) continue;
nickNameList.add(nickName);
}
performanceNodePo.setPMembers(cidUserResp.getData().stream().map(CIDUserResp::getNickname).collect(Collectors.joining(",")));
if (CollectionUtils.isEmpty(nickNameList)) continue;
performanceNodePo.setPMembers(String.join(",",nickNameList));
}
}
JSONObject jsonObject = new JSONObject();
@@ -1786,7 +1794,7 @@ public class TaskServiceImpl implements ITaskService {
return SdmResponse.success(new ArrayList<>());
}
List<String> taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList();
List<TaskRunPo> runPoList = projectMapper.queryRunListByNodeIdList(taskIdList, req.getBeginTime(), req.getEndTime(), req.getName());
List<TaskRunPo> runPoList = projectMapper.queryRunListByNodeIdList(taskIdList, req);
if (CollectionUtils.isEmpty(runPoList)) {
log.error("算例查询中，未查询到算例1");
return SdmResponse.success(new ArrayList<>());
@@ -1812,6 +1820,12 @@ public class TaskServiceImpl implements ITaskService {
}
SpdmAnalysisTaskVo eachTaskVo;
List<TaskNodeMemberPo> eachTaskNodeMemberPoList;
SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder()
.userIds(taskNodeMemberPoList.stream().map(TaskNodeMemberPo::getUserId).toList()).build());
Map<Long, String> cidUserMap = new HashMap<>();
if (cidUserResp != null && cidUserResp.isSuccess() && CollectionUtils.isNotEmpty(cidUserResp.getData())) {
cidUserMap = cidUserResp.getData().stream().collect(Collectors.toMap(CIDUserResp::getUserId, CIDUserResp::getNickname));
}
for (TaskRunPo taskRunPo : runPoList) {
eachTaskVo = taskMap.get(taskRunPo.getTaskId());
if (ObjectUtils.isEmpty(eachTaskVo)) {
@@ -1824,11 +1838,13 @@ public class TaskServiceImpl implements ITaskService {
taskRunPo.setPMembers(eachTaskVo.getPMembers());
eachTaskNodeMemberPoList = memberMap.get(eachTaskVo.getUuid());
if (CollectionUtils.isNotEmpty(eachTaskNodeMemberPoList)) {
SdmResponse<List<CIDUserResp>> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder()
.userIds(eachTaskNodeMemberPoList.stream().map(TaskNodeMemberPo::getUserId).toList()).build());
if (cidUserResp == null || !cidUserResp.isSuccess() || CollectionUtils.isEmpty(cidUserResp.getData())) {
continue;
List<String> nickNameList = new ArrayList<>();
for (TaskNodeMemberPo taskNodeMemberPo : eachTaskNodeMemberPoList) {
String nickName = cidUserMap.get(taskNodeMemberPo.getUserId());
if (StringUtils.isBlank(nickName)) continue;
nickNameList.add(nickName);
}
if (CollectionUtils.isEmpty(nickNameList)) continue;
taskRunPo.setPMembers(cidUserResp.getData().stream().map(CIDUserResp::getNickname).collect(Collectors.joining(",")));
}
}
@@ -3845,6 +3861,7 @@ public class TaskServiceImpl implements ITaskService {
.eq(SimulationNodeExtra::getPropertyName, SimulationNodeExtra.PROPERTY_NAME_REFERENCE_ITEM)
.list()
.stream()
.filter(nodeExtra -> nodeExtra.getPropertyValue() != null)
.collect(Collectors.toMap(
SimulationNodeExtra::getNodeId, // key：项目的uuid
SimulationNodeExtra::getPropertyValue, // value：参考项目的属性值

140
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -568,19 +568,77 @@
#{taskId}
</foreach>
)
<if test="beginTime != null and beginTime != ''">
<if test="req.beginTime != null and req.beginTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') >= #{beginTime}
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') >= #{req.beginTime}
]]>
</if>
<if test="endTime != null and endTime != ''">
<if test="req.endTime != null and req.endTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') <= #{endTime}
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') <= #{req.endTime}
]]>
</if>
<if test="name != null and name != ''">
<bind name="searchKey" value="'%' + name+ '%'"/>
and nodeName like #{searchKey}
<if test="req.name != null and req.name != ''">
<bind name="searchKey1" value="'%' + req.name+ '%'"/>
and nodeName like #{searchKey1}
</if>
<if test="req.englishName != null and req.englishName != ''">
<bind name="searchKey2" value="'%' + req.englishName+ '%'"/>
and englishName like #{searchKey2}
</if>
<if test="req.nodeCode != null and req.nodeCode != ''">
<bind name="searchKey3" value="'%' + req.nodeCode+ '%'"/>
and nodeCode like #{searchKey3}
</if>
<if test="req.poolName != null and req.poolName != ''">
<bind name="searchKey4" value="'%' + req.poolName+ '%'"/>
and poolName like #{searchKey4}
</if>
<if test="req.performanceType != null and req.performanceType != ''">
and performanceType = #{req.performanceType}
</if>
<if test="req.unit != null and req.unit != ''">
<bind name="searchKey5" value="'%' + req.unit+ '%'"/>
and unit like #{searchKey5}
</if>
<if test="req.targetValue != null and req.targetValue != ''">
<bind name="searchKey6" value="'%' + req.targetValue+ '%'"/>
and targetValue like #{searchKey6}
</if>
<if test="req.lowValue != null and req.lowValue != ''">
<bind name="searchKey7" value="'%' + req.lowValue+ '%'"/>
and lowValue like #{searchKey7}
</if>
<if test="req.highValue != null and req.highValue != ''">
<bind name="searchKey8" value="'%' + req.highValue+ '%'"/>
and highValue like #{searchKey8}
</if>
<if test="req.highValue != null and req.highValue != ''">
<bind name="searchKey8" value="'%' + req.highValue+ '%'"/>
and highValue like #{searchKey8}
</if>
<if test="req.method != null and req.method != ''">
<bind name="searchKey9" value="'%' + req.method+ '%'"/>
and method like #{searchKey9}
</if>
<if test="req.completeStatus != null and req.completeStatus != ''">
and completeStatus = #{req.completeStatus}
</if>
<if test="req.resultValue != null and req.resultValue != ''">
<bind name="searchKey10" value="'%' + req.resultValue+ '%'"/>
and resultValue like #{searchKey10}
</if>
<if test="req.description != null and req.description != ''">
<bind name="searchKey11" value="'%' + req.description+ '%'"/>
and description like #{searchKey11}
</if>
<if test="req.taskName != null and req.taskName != ''">
<bind name="searchKey12" value="'%' + req.taskName+ '%'"/>
and taskName like #{searchKey12}
</if>
<if test="req.standard != null and req.standard != ''">
<bind name="searchKey13" value="'%' + req.standard+ '%'"/>
and standard like #{searchKey13}
</if>
order by createTime desc
</select>
@@ -599,19 +657,73 @@
#{taskId}
</foreach>
)
<if test="beginTime != null and beginTime != ''">
<if test="req.beginTime != null and req.beginTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') >= #{beginTime}
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') >= #{req.beginTime}
]]>
</if>
<if test="endTime != null and endTime != ''">
<if test="req.endTime != null and req.endTime != ''">
<![CDATA[
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') <= #{endTime}
and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') <= #{req.endTime}
]]>
</if>
<if test="name != null and name != ''">
<bind name="searchKey" value="'%' + name + '%'"/>
and runName like #{searchKey}
<if test="req.name != null and req.name != ''">
<bind name="searchKey1" value="'%' + req.name + '%'"/>
and runName like #{searchKey1}
</if>
<if test="req.type != null and req.type != ''">
and type = #{req.type}
</if>
<if test="req.taskId != null and req.taskId != ''">
and taskId like #{req.taskId}
</if>
<if test="req.flowTemplate != null and req.flowTemplate != ''">
<bind name="searchKey2" value="'%' + req.flowTemplate + '%'"/>
and flowTemplate like #{searchKey2}
</if>
<if test="req.status != null and req.status != ''">
and status = #{req.status}
</if>
<if test="req.totalStep != null and req.totalStep != ''">
and totalStep = #{req.totalStep}
</if>
<if test="req.currentStep != null and req.currentStep != ''">
and currentStep - #{req.currentStep}
</if>
<if test="req.currentStepName != null and req.currentStepName != ''">
<bind name="searchKey3" value="'%' + req.currentStepName + '%'"/>
and currentStepName like #{searchKey3}
</if>
<if test="req.achieveStatus != null and req.achieveStatus != ''">
and achieveStatus = #{req.achieveStatus}
</if>
<if test="req.description != null and req.description != ''">
<bind name="searchKey4" value="'%' + req.description + '%'"/>
and description like #{searchKey4}
</if>
<if test="req.parentId != null and req.parentId != ''">
and parentId = #{req.parentId}
</if>
<if test="req.isPersonalTemplate != null and req.isPersonalTemplate != ''">
and isPersonalTemplate = #{req.isPersonalTemplate}
</if>
<if test="req.englishName != null and req.englishName != ''">
<bind name="searchKey5" value="'%' + req.englishName + '%'"/>
and englishName like #{searchKey5}
</if>
<if test="req.processDefinitionId != null and req.processDefinitionId != ''">
and processDefinitionId = #{req.processDefinitionId}
</if>
<if test="req.flowInstanceId != null and req.flowInstanceId != ''">
and flowInstanceId = #{req.flowInstanceId}
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">
<bind name="searchKey6" value="'%' + req.reportTemplate + '%'"/>
and reportTemplate like #{searchKey6}
</if>
<if test="req.reportContent != null and req.reportContent != ''">
<bind name="searchKey7" value="'%' + req.reportContent + '%'"/>
and reportContent like #{searchKey7}
</if>
order by createTime desc
</select>

195
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -253,6 +253,103 @@
<bind name="searchKey2" value="'%' + req.name + '%'"/>
and st.task_name like #{searchKey2}
</if>
<if test="req.taskCode != null and req.taskCode != ''">
<bind name="searchKey3" value="'%' + req.taskCode + '%'"/>
and st.task_code like #{searchKey3}
</if>
<if test="req.days != null and req.days != ''">
<bind name="searchKey4" value="'%' + req.days + '%'"/>
and st.days like #{searchKey4}
</if>
<if test="req.realDays != null and req.realDays != ''">
<bind name="searchKey5" value="'%' + req.realDays + '%'"/>
and st.realDays like #{searchKey5}
</if>
<if test="req.standard != null and req.standard != ''">
<bind name="searchKey6" value="'%' + req.standard + '%'"/>
and st.standard like #{searchKey6}
</if>
<if test="req.status != null and req.status != ''">
and st.status = #{req.status}
</if>
<if test="req.achieveStatus != null and req.achieveStatus != ''">
and st.achieve_status = #{req.achieveStatus}
</if>
<if test="req.progress != null and req.progress != ''">
<bind name="searchKey7" value="'%' + req.progress + '%'"/>
and st.progress like #{searchKey7}
</if>
<if test="req.exeStatus != null and req.exeStatus != ''">
and st.exe_status like #{req.exeStatus}
</if>
<if test="req.confidence != null and req.confidence != ''">
<bind name="searchKey8" value="'%' + req.confidence + '%'"/>
and st.confidence like #{searchKey8}
</if>
<if test="req.analyseTarget != null and req.analyseTarget != ''">
<bind name="searchKey9" value="'%' + req.analyseTarget + '%'"/>
and st.analyse_target like #{searchKey9}
</if>
<if test="req.analyseSoftware != null and req.analyseSoftware != ''">
<bind name="searchKey10" value="'%' + req.analyseSoftware + '%'"/>
and st.analyse_software like #{searchKey10}
</if>
<if test="req.approvalStatus != null and req.approvalStatus != ''">
and st.approvalStatus = #{req.approvalStatus}
</if>
<if test="req.comfirmStatus != null and req.comfirmStatus != ''">
<bind name="searchKey11" value="'%' + req.comfirmStatus + '%'"/>
and st.comfirm_status like #{searchKey11}
</if>
<if test="req.difficult != null and req.difficult != ''">
and st.difficult = #{req.difficult}
</if>
<if test="req.department != null and req.department != ''">
<bind name="searchKey12" value="'%' + req.department + '%'"/>
and st.department like #{searchKey12}
</if>
<if test="req.sectionName != null and req.sectionName != ''">
<bind name="searchKey13" value="'%' + req.sectionName + '%'"/>
and st.sectionName like #{searchKey13}
</if>
<if test="req.groupName != null and req.groupName != ''">
<bind name="searchKey14" value="'%' + req.groupName + '%'"/>
and st.groupName like #{searchKey14}
</if>
<if test="req.bCapacity != null and req.bCapacity != ''">
<bind name="searchKey15" value="'%' + req.bCapacity + '%'"/>
and st.bCapacity like #{searchKey15}
</if>
<if test="req.flowTemplate != null and req.flowTemplate != ''">
<bind name="searchKey16" value="'%' + req.flowTemplate + '%'"/>
and st.flowTemplate like #{searchKey16}
</if>
<if test="req.demandId != null and req.demandId != ''">
and st.demandId = #{req.demandId}
</if>
<if test="req.cidFlowId != null and req.cidFlowId != ''">
and st.cidFlowId = #{req.cidFlowId}
</if>
<if test="req.imageFileId != null and req.imageFileId != ''">
and st.imageFileId = #{req.imageFileId}
</if>
<if test="req.expStatus != null and req.expStatus != ''">
and st.expStatus = #{req.expStatus}
</if>
<if test="req.discipline != null and req.discipline != ''">
<bind name="searchKey17" value="'%' + req.discipline + '%'"/>
and st.discipline like #{searchKey17}
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">
<bind name="searchKey18" value="'%' + req.reportTemplate + '%'"/>
and st.reportTemplate like #{searchKey18}
</if>
<if test="req.reportContent != null and req.reportContent != ''">
<bind name="searchKey19" value="'%' + req.reportContent + '%'"/>
and st.reportContent like #{searchKey19}
</if>
<if test="req.beginTime != null and req.beginTime != ''">
<![CDATA[
and STR_TO_DATE(st.begin_time,'%Y-%m-%d %H:%i:%s') >= #{req.beginTime}
@@ -286,6 +383,104 @@
<bind name="searchKey2" value="'%' + req.name + '%'"/>
and st.task_name like #{searchKey2}
</if>
<if test="req.taskCode != null and req.taskCode != ''">
<bind name="searchKey3" value="'%' + req.taskCode + '%'"/>
and st.task_code like #{searchKey3}
</if>
<if test="req.days != null and req.days != ''">
<bind name="searchKey4" value="'%' + req.days + '%'"/>
and st.days like #{searchKey4}
</if>
<if test="req.realDays != null and req.realDays != ''">
<bind name="searchKey5" value="'%' + req.realDays + '%'"/>
and st.realDays like #{searchKey5}
</if>
<if test="req.standard != null and req.standard != ''">
<bind name="searchKey6" value="'%' + req.standard + '%'"/>
and st.standard like #{searchKey6}
</if>
<if test="req.status != null and req.status != ''">
and st.status = #{req.status}
</if>
<if test="req.achieveStatus != null and req.achieveStatus != ''">
and st.achieve_status = #{req.achieveStatus}
</if>
<if test="req.progress != null and req.progress != ''">
<bind name="searchKey7" value="'%' + req.progress + '%'"/>
and st.progress like #{searchKey7}
</if>
<if test="req.exeStatus != null and req.exeStatus != ''">
and st.exe_status like #{req.exeStatus}
</if>
<if test="req.confidence != null and req.confidence != ''">
<bind name="searchKey8" value="'%' + req.confidence + '%'"/>
and st.confidence like #{searchKey8}
</if>
<if test="req.analyseTarget != null and req.analyseTarget != ''">
<bind name="searchKey9" value="'%' + req.analyseTarget + '%'"/>
and st.analyse_target like #{searchKey9}
</if>
<if test="req.analyseSoftware != null and req.analyseSoftware != ''">
<bind name="searchKey10" value="'%' + req.analyseSoftware + '%'"/>
and st.analyse_software like #{searchKey10}
</if>
<if test="req.approvalStatus != null and req.approvalStatus != ''">
and st.approvalStatus = #{req.approvalStatus}
</if>
<if test="req.comfirmStatus != null and req.comfirmStatus != ''">
<bind name="searchKey11" value="'%' + req.comfirmStatus + '%'"/>
and st.comfirm_status like #{searchKey11}
</if>
<if test="req.difficult != null and req.difficult != ''">
and st.difficult = #{req.difficult}
</if>
<if test="req.department != null and req.department != ''">
<bind name="searchKey12" value="'%' + req.department + '%'"/>
and st.department like #{searchKey12}
</if>
<if test="req.sectionName != null and req.sectionName != ''">
<bind name="searchKey13" value="'%' + req.sectionName + '%'"/>
and st.sectionName like #{searchKey13}
</if>
<if test="req.groupName != null and req.groupName != ''">
<bind name="searchKey14" value="'%' + req.groupName + '%'"/>
and st.groupName like #{searchKey14}
</if>
<if test="req.bCapacity != null and req.bCapacity != ''">
<bind name="searchKey15" value="'%' + req.bCapacity + '%'"/>
and st.bCapacity like #{searchKey15}
</if>
<if test="req.flowTemplate != null and req.flowTemplate != ''">
<bind name="searchKey16" value="'%' + req.flowTemplate + '%'"/>
and st.flowTemplate like #{searchKey16}
</if>
<if test="req.demandId != null and req.demandId != ''">
and st.demandId = #{req.demandId}
</if>
<if test="req.cidFlowId != null and req.cidFlowId != ''">
and st.cidFlowId = #{req.cidFlowId}
</if>
<if test="req.imageFileId != null and req.imageFileId != ''">
and st.imageFileId = #{req.imageFileId}
</if>
<if test="req.expStatus != null and req.expStatus != ''">
and st.expStatus = #{req.expStatus}
</if>
<if test="req.discipline != null and req.discipline != ''">
<bind name="searchKey17" value="'%' + req.discipline + '%'"/>
and st.discipline like #{searchKey17}
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">
<bind name="searchKey18" value="'%' + req.reportTemplate + '%'"/>
and st.reportTemplate like #{searchKey18}
</if>
<if test="req.reportContent != null and req.reportContent != ''">
<bind name="searchKey19" value="'%' + req.reportContent + '%'"/>
and st.reportContent like #{searchKey19}
</if>
<if test="req.beginTime != null and req.beginTime != ''">
<![CDATA[
and STR_TO_DATE(st.begin_time,'%Y-%m-%d %H:%i:%s') >= #{req.beginTime}

2
system/src/main/resources/application-yian.yml
View File

@@ -145,7 +145,7 @@ cid:
user:
listUser: /spdm-user/listUser
queryUserDetail: /spdm-user/queryUserDetail
listUserByIds: /spdm-user/listUserByIds
listUserByIds: /dataManager/tree/node/listUserByIds
listUserDetailByIds: /spdm-user/listUserDetailByIds
queryUserRole: /spdm-user/queryUserRole
queryGroup: /spdm-user/queryGroup