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

fix:载体下发销毁接口提交

Browse Source
pg_adapter
wangxy 8 months ago
parent 929cb84c54
commit 24a675f77b
11 changed files with 273 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,21 +3,24 @@ package com.ruoyi.web.controller.manager;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.CharSequenceUtil;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.system.domain.check.TdCheckReport;
import com.ruoyi.system.domain.check.TdCheckType;
import com.ruoyi.system.domain.check.dto.CheckTypeDTO;
import com.ruoyi.system.domain.check.dto.CheckTypeItemDTO;
import com.ruoyi.system.domain.check.dto.TdCheckReportDTO;
import com.ruoyi.system.domain.check.dto.TdCheckTypeDTO;
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;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* packageName com.ruoyi.web.controller.manager
@ -39,6 +42,11 @@ public class CheckReportManager {
private TdCheckTypeService checkTypeService;
@Autowired
private ISysDictDataService dictDataService;
public List<TdCheckReport> selectTdCheckReportList(TdCheckReport tdCheckReport) {
return checkReportService.selectTdCheckReportList(tdCheckReport);
}
@ -69,6 +77,39 @@ public class CheckReportManager {
return checkTypeService.saveBatch(list);
}
public List<CheckTypeDTO> getCheckTypeDTO(String type) {
List<CheckTypeDTO> checkTypeDtoS = new ArrayList<>();
SysDictData sysDictData =new SysDictData();
sysDictData.setDictType(type);
List<SysDictData> list = dictDataService.selectDictDataList(sysDictData);
list.forEach(sysDictData1 -> {
List<CheckTypeItemDTO> checkTypeItemDTOList =new ArrayList<>();
checkTypeDtoS.add(CheckTypeDTO.builder()
.typeName(sysDictData1.getDictLabel())
.checkType(sysDictData1.getDictValue()).checkTypeItemDTOList(checkTypeItemDTOList).build());
SysDictData dictData = new SysDictData();
dictData.setDictType(sysDictData1.getDictValue());
List<SysDictData> dataList = dictDataService.selectDictDataList(dictData);
dataList.forEach(sysDictData2 -> checkTypeItemDTOList.add(CheckTypeItemDTO.builder().typeName(sysDictData1.getDictLabel())
.checkType(sysDictData1.getDictValue())
.checkItems(sysDictData2.getDictLabel())
.typeContent(sysDictData2.getDictValue())
.score(sysDictData2.getCssClass())
.deductionCriteria(sysDictData2.getRemark())
.build()));
});
return checkTypeDtoS;
}
@Transactional(rollbackFor = Exception.class)
public boolean deletedTdCheckReportIds(String ids) {
List<String> list = Arrays.asList(Convert.toStrArray(ids));
checkTypeService.lambdaUpdate().in(TdCheckType::getCheckId,list).remove();
return checkReportService.removeByIds(list);
}
public TdCheckReportDTO getTdCheckReportDTO(String id) {
TdCheckReport tdCheckReport = checkReportService.getById(id);
TdCheckReportDTO tdCheckReportDto = Convert.convert(TdCheckReportDTO.class, tdCheckReport);
@ -82,12 +123,4 @@ public class CheckReportManager {
}
@Transactional(rollbackFor = Exception.class)
public boolean deletedTdCheckReportIds(String ids) {
List<String> list = Arrays.asList(Convert.toStrArray(ids));
checkTypeService.lambdaUpdate().in(TdCheckType::getCheckId,list).remove();
return checkReportService.removeByIds(list);
}
}

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java
Unescape View File

@ -140,6 +140,15 @@ public class CheckReportController extends BaseController {
return AjaxResult.success(checkReportManager.getTdCheckReportDTO(checkId));
}
/**
* 查询自查项 :sys_check_type_report
*/
@GetMapping("/checkView/{type}")
@ResponseBody
public AjaxResult checkView(@PathVariable("type") String type) {
return AjaxResult.success(checkReportManager.getCheckTypeDTO(type));
}
/**
* 删除

13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java
Unescape View File

@ -133,19 +133,6 @@ public class TdCheckResultController extends BaseController {
@PostMapping("/checkresult")
@ResponseBody
public AjaxResult selfcheckSave(@RequestBody TdCheckReportDTO checkReportDTO) {
boolean flag = false;
List<TdCheckTypeDTO> checkTypeDtoS = checkReportDTO.getCheckTypeDTOS();
for (TdCheckTypeDTO tdCheckTypeDTO :checkTypeDtoS){
if("1".equals(tdCheckTypeDTO.getResultStarts())){
flag = true;
break;
}
}
if (flag) {
checkReportDTO.setCheckState("1");
} else {
checkReportDTO.setCheckState("0");
}
return toAjax(checkReportManager.saveOrUpdate(checkReportDTO));
}

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

@ -88,6 +88,28 @@ public class TdCheckReport implements Serializable {
*/
private Date createTime;
/**
* 实有项目总分
*/
private String totalScore;
/**
* 实有项目得分
*/
private String realScore;
/**
* 得分占比
*/
private String percentageScore;
/**
* 备注
*/
private String remark;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

35
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckType.java
Unescape View File

@ -28,24 +28,49 @@ public class TdCheckType implements Serializable {
private String checkId;
/**
* 检查类型
* 自查类
*/
private String checkType;
/**
* 自查类名称
*/
private String typeName;
/**
* 内容
* 自查项
*/
private String checkItems;
/**
* 自查内容
*/
private String typeContent;
/**
* 自查状态，0合格，1不合格
* 分值
*/
private String score;
/**
* 得分
*/
private String realScore;
/**
* 实有内容:检查了存打钩:1
*/
private String starts;
/**
* 结果状态，0合格，1不合格
* 扣分标准
*/
private String resultStarts;
private String deductionCriteria;
/**
* 批注

39
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckTypeDTO.java
Unescape View File

@ -0,0 +1,39 @@
package com.ruoyi.system.domain.check.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
*
* @author 13560
* @TableName td_check_type
*/
@Data
@Builder
public class CheckTypeDTO implements Serializable {
/**
* 自查类
*/
private String checkType;
/**
* 自查类名称
*/
private String typeName;
/**
* 检查类型
*/
private List<CheckTypeItemDTO> checkTypeItemDTOList;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

65
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/CheckTypeItemDTO.java
Unescape View File

@ -0,0 +1,65 @@
package com.ruoyi.system.domain.check.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
/**
*
* @author 13560
* @TableName td_check_type
*/
@Data
@Builder
public class CheckTypeItemDTO implements Serializable {
/**
* 自查类
*/
private String checkType;
/**
* 自查类名称
*/
private String typeName;
/**
* 自查项
*/
private String checkItems;
/**
* 自查内容
*/
private String typeContent;
/**
* 分值
*/
private String score;
/**
* 得分
*/
private String realScore;
/**
* 实有内容:检查了存打钩:1
*/
private String starts;
/**
* 扣分标准
*/
private String deductionCriteria;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

21
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckReportDTO.java
Unescape View File

@ -72,6 +72,27 @@ public class TdCheckReportDTO implements Serializable {
*/
private Date createTime;
/**
* 实有项目总分
*/
private String totalScore;
/**
* 实有项目得分
*/
private String realScore;
/**
* 得分占比
*/
private String percentageScore;
/**
* 备注
*/
private String remark;
@TableField(exist = false)
private static final long serialVersionUID = 1L;

36
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/dto/TdCheckTypeDTO.java
Unescape View File

@ -26,30 +26,56 @@ public class TdCheckTypeDTO implements Serializable {
private String checkId;
/**
* 检查类型
* 自查类
*/
private String checkType;
/**
* 自查类名称
*/
private String typeName;
/**
* 内容
* 自查项
*/
private String checkItems;
/**
* 自查内容
*/
private String typeContent;
/**
* 自查状态，0合格，1不合格
* 分值
*/
private String score;
/**
* 得分
*/
private String realScore;
/**
* 实有内容:检查了存打钩:1
*/
private String starts;
/**
* 结果状态，0合格，1不合格
* 扣分标准
*/
private String resultStarts;
private String deductionCriteria;
/**
* 批注
*/
private String remark;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

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

@ -16,13 +16,17 @@
<result property="checkState" column="check_state" jdbcType="VARCHAR"/>
<result property="checkName" column="check_name" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="totalScore" column="total_score" jdbcType="VARCHAR"/>
<result property="realScore" column="real_score" jdbcType="VARCHAR"/>
<result property="percentageScore" column="percentage_score" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
</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
check_name,create_time,total_score,real_score,percentage_score,remark
</sql>
<select id="selectTdCheckReportList" resultType="com.ruoyi.system.domain.check.TdCheckReport">
select <include refid="Base_Column_List"/> from td_check_report

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

@ -10,13 +10,17 @@
<result property="checkType" column="check_type" jdbcType="VARCHAR"/>
<result property="typeContent" column="type_content" jdbcType="VARCHAR"/>
<result property="starts" column="starts" jdbcType="VARCHAR"/>
<result property="resultStarts" column="result_starts" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="typeName" column="type_name" jdbcType="VARCHAR"/>
<result property="checkItems" column="check_items" jdbcType="VARCHAR"/>
<result property="score" column="score" jdbcType="VARCHAR"/>
<result property="realScore" column="real_score" jdbcType="VARCHAR"/>
<result property="deductionCriteria" column="deduction_criteria" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,check_id,check_type,
type_content,starts,result_starts,
type_content,starts,type_name,check_items,score,real_score,deduction_criteria,
remark
</sql>
</mapper>

Write Preview
Loading…
Cancel
Save