luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:自查自评

Browse Source
new-exam
wangxy 5 months ago
parent 33e5960620
commit a1b1aeb71c
11 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java
Unescape View File

@ -11,7 +11,6 @@ import com.ruoyi.system.domain.check.dto.*;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.check.TdCheckReportService;
import com.ruoyi.system.service.check.TdCheckTypeService;
import lombok.val;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@ -60,11 +59,15 @@ public class CheckReportManager {
checkTypeService.lambdaUpdate()
.eq(TdCheckType::getCheckId, checkReportDTO.getCheckId())
.remove();
tdCheckReport.setUpdateTime(new Date());
tdCheckReport.setUpdateBy(ShiroUtils.getSysUser().getUserName());
} else {
tdCheckReport.setDepart(ShiroUtils.getSysUser().getDept().getDeptName());
tdCheckReport.setAdduser(ShiroUtils.getSysUser().getUserName());
tdCheckReport.setCreateTime(new Date());
tdCheckReport.setCreateBy(ShiroUtils.getSysUser().getUserName());
}
tdCheckReport.setDeptId(ShiroUtils.getSysUser().getDeptId());
checkReportService.saveOrUpdate(tdCheckReport);
List<TdCheckType> list = Convert.toList(TdCheckType.class, checkReportDTO.getCheckTypeDTOS());
list.forEach(checkReport -> checkReport.setCheckId(tdCheckReport.getCheckId()));

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdMeetingManager.java
Unescape View File

@ -43,6 +43,7 @@ public class TdMeetingManager {
tdMeeting.setCreateBy(ShiroUtils.getSysUser().getLoginName());
tdMeeting.setCreateTime(new Date());
}
tdMeeting.setDeptId(ShiroUtils.getSysUser().getDeptId());
return meetingService.saveOrUpdate(tdMeeting);
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdPlaceManager.java
Unescape View File

@ -50,6 +50,7 @@ public class TdPlaceManager {
tdPlace.setIsDissolve("0");
tdPlace.setAfterName(tdPlace.getPlaceName());
tdPlace.setAfterRule(tdPlace.getPlaceRule());
tdPlace.setDeptId(ShiroUtils.getSysUser().getDeptId());
return placeService.saveOrUpdate(tdPlace);
}
@ -57,6 +58,7 @@ public class TdPlaceManager {
public boolean updateChange(TdPlace tdPlace) {
tdPlace.setAfterTime(new Date());
tdPlace.setState("2");
tdPlace.setDeptId(ShiroUtils.getSysUser().getDeptId());
return placeService.saveOrUpdate(tdPlace);
}

17
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckReport.java
Unescape View File

@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@ -20,7 +24,7 @@ import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class TdCheckReport implements Serializable {
public class TdCheckReport extends BaseEntity {
/**
* id
*/
@ -79,10 +83,6 @@ public class TdCheckReport implements Serializable {
*/
private String checkName;
/**
* 创建时间
*/
private Date createTime;
/**
* 实有项目总分
@ -102,13 +102,6 @@ public class TdCheckReport implements Serializable {
@Excel(name = "得分占比")
private String percentageScore;
/**
* 备注
*/
@Excel(name = "备注")
private String remark;
/**
* 部门
*/

16
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckReportDTO.java
Unescape View File

@ -2,13 +2,17 @@ package com.ruoyi.system.domain.check.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
* 检查报告结果
@ -18,7 +22,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckReportDTO implements Serializable {
public class CheckReportDTO extends BaseEntity {
/**
* id
*/
@ -77,11 +81,6 @@ public class CheckReportDTO implements Serializable {
*/
private String checkName;
/**
* 创建时间
*/
private Date createTime;
/**
* 实有项目总分
*/
@ -102,10 +101,9 @@ public class CheckReportDTO implements Serializable {
/**
* 备注
* 部门
*/
@Excel(name = "备注")
private String remark;
private Long deptId;
@TableField(exist = false)

2
ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.check.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.system.domain.check.TdCheckReport;
import com.ruoyi.system.domain.check.dto.CheckReportDTO;
import com.ruoyi.system.domain.count.CheckResultCountDTO;
@ -26,6 +27,7 @@ public class TdCheckReportServiceImpl extends ServiceImpl<TdCheckReportMapper, T
@Resource
private TdCheckReportMapper checkReportMapper;
@DataScope(deptAlias = "d")
@Override
public List<TdCheckReport> selectTdCheckReportList(CheckReportDTO tdCheckReport) {
return checkReportMapper.selectTdCheckReportList(tdCheckReport);

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdMeetingServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.system.domain.TdMeeting;
import com.ruoyi.system.mapper.TdMeetingMapper;
import com.ruoyi.system.service.TdMeetingService;
@ -21,6 +22,7 @@ public class TdMeetingServiceImpl extends ServiceImpl<TdMeetingMapper, TdMeeting
@Resource
private TdMeetingMapper meetingMapper;
@DataScope(deptAlias = "d")
@Override
public List<TdMeeting> selectTdMeetingList(TdMeeting tdMeeting) {
return meetingMapper.selectTdMeetingList(tdMeeting);

3
ruoyi-system/src/main/java/com/ruoyi/system/service/place/impl/TdPlaceServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.place.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.system.domain.place.TdPlace;
import com.ruoyi.system.mapper.TdMeetingMapper;
import com.ruoyi.system.mapper.place.TdPlaceMapper;
@ -22,11 +23,13 @@ public class TdPlaceServiceImpl extends ServiceImpl<TdPlaceMapper, TdPlace>
@Resource
private TdPlaceMapper placeMapper;
@DataScope(deptAlias = "d")
@Override
public List<TdPlace> selectTdPlaceList(TdPlace tdPlace) {
return placeMapper.selectTdPlaceList(tdPlace);
}
@DataScope(deptAlias = "d")
@Override
public List<TdPlace> selectTdPlaceChangeList(TdPlace tdPlace) {
return placeMapper.selectTdPlaceChangeList(tdPlace);

9
ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml
Unescape View File

@ -21,16 +21,19 @@
<result property="percentageScore" column="percentage_score" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="Base_Column_List">
check_id,adduser,depart,
check_start_time,check_end_time,check_type,
area,framework,check_state,
check_name,create_time,total_score,real_score,percentage_score,remark,dept_id
check_name,create_time,total_score,real_score,percentage_score,remark,dept_id,create_by,update_by,update_time
</sql>
<select id="selectTdCheckReportList" resultType="com.ruoyi.system.domain.check.TdCheckReport">
select <include refid="Base_Column_List"/> from td_check_report
select <include refid="Base_Column_List"/> from td_check_report d
<trim prefix="where" prefixOverrides="and|or">
<if test="area!=null and area!=''">
AND area = #{area}
@ -56,6 +59,8 @@
<if test="checkEndTime != null and checkEndTime!=''"><!-- 结束时间检索 -->
AND check_end_time &lt;= #{checkEndTime}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>
ORDER BY create_time DESC
</select>

4
ruoyi-system/src/main/resources/mapper/system/TdMeetingMapper.xml
Unescape View File

@ -33,7 +33,7 @@
file_name,create_by, create_time, update_by, update_time, remark,dept_id
</sql>
<select id="selectTdMeetingList" resultType="com.ruoyi.system.domain.TdMeeting">
select <include refid="Base_Column_List"/> from td_meeting
select <include refid="Base_Column_List"/> from td_meeting d
<trim prefix="where" prefixOverrides="and|or">
<if test="meetingType!=null and meetingType!=''">
AND meeting_type = #{meetingType}
@ -44,6 +44,8 @@
<if test="meetingTitle!=null and meetingTitle!=''">
AND meeting_title LIKE concat('%',#{meetingTitle},'%')
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>
ORDER BY create_time DESC
</select>

8
ruoyi-system/src/main/resources/mapper/system/TdPlaceMapper.xml
Unescape View File

@ -27,21 +27,25 @@
update_time,remark,after_time,after_name,after_rule,state,is_dissolve,dept_id
</sql>
<select id="selectTdPlaceList" resultType="com.ruoyi.system.domain.place.TdPlace">
select <include refid="Base_Column_List"/> from td_place
select <include refid="Base_Column_List"/> from td_place d
<trim prefix="where" prefixOverrides="and|or">
<if test="placeName!=null and placeName!=''">
AND place_name LIKE concat('%',#{placeName},'%')
</if>
AND state !='0'
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>
ORDER BY create_time DESC
</select>
<select id="selectTdPlaceChangeList" resultType="com.ruoyi.system.domain.place.TdPlace">
select <include refid="Base_Column_List"/> from td_place
select <include refid="Base_Column_List"/> from td_place d
<trim prefix="where" prefixOverrides="and|or">
<if test="placeName!=null and placeName!=''">
AND place_name LIKE concat('%',#{placeName},'%')
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>
ORDER BY create_time DESC
</select>

Write Preview
Loading…
Cancel
Save