From e4c63c11d866f4dad001cbe76d83540fcac70d17 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 13:43:43 +0800
Subject: [PATCH] 考核删除多余类
---
/dev/null | 27 ---------------------------
ycl-server/src/main/java/com/ycl/task/ContractResultTask.java | 2 --
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java | 1 -
3 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckPublish.java
deleted file mode 100644
index 6e6bd16..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckPublish.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.ycl.platform.domain.entity;
-
-import annotation.Excel;
-import com.ycl.system.entity.BaseEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-
-/**
- * 鑰冩牳鍙戝竷瀵硅薄 t_check_publish
- *
- * @author ruoyi
- * @date 2024-04-01
- */
-public class CheckPublish extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 涓婚敭 */
- private Long id;
-
- /** 鑰冩牳鍚嶇О */
- @Excel(name = "鑰冩牳鍚嶇О")
- private String examineName;
-
- /** 鑰冩牳妯℃澘id */
- @Excel(name = "鑰冩牳妯℃澘id")
- private Long templateId;
-
- /** 鑰冩牳棰戠巼 */
- @Excel(name = "鑰冩牳棰戠巼")
- private Long frequency;
-
- /** 鑰冩牳绫诲瀷 */
- @Excel(name = "鑰冩牳绫诲瀷")
- private Long examineCategory;
-
- /** 鎶ヨ闃堝�煎垎鏁� */
- @Excel(name = "鎶ヨ闃堝�煎垎鏁�")
- private BigDecimal alarmScore;
-
- /** 鎻忚堪 */
- @Excel(name = "鎻忚堪")
- private String description;
-
- /** 鍚敤 / 鍋滅敤 */
- @Excel(name = "鍚敤 / 鍋滅敤")
- private Long state;
-
- /** 瀹℃牳鐘舵�� */
- @Excel(name = "瀹℃牳鐘舵��")
- private Long auditState;
-
- /** */
- private Long createUser;
-
- /** */
- private Long updateUser;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setExamineName(String examineName)
- {
- this.examineName = examineName;
- }
-
- public String getExamineName()
- {
- return examineName;
- }
- public void setTemplateId(Long templateId)
- {
- this.templateId = templateId;
- }
-
- public Long getTemplateId()
- {
- return templateId;
- }
- public void setFrequency(Long frequency)
- {
- this.frequency = frequency;
- }
-
- public Long getFrequency()
- {
- return frequency;
- }
- public void setExamineCategory(Long examineCategory)
- {
- this.examineCategory = examineCategory;
- }
-
- public Long getExamineCategory()
- {
- return examineCategory;
- }
- public void setAlarmScore(BigDecimal alarmScore)
- {
- this.alarmScore = alarmScore;
- }
-
- public BigDecimal getAlarmScore()
- {
- return alarmScore;
- }
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- public String getDescription()
- {
- return description;
- }
- public void setState(Long state)
- {
- this.state = state;
- }
-
- public Long getState()
- {
- return state;
- }
- public void setAuditState(Long auditState)
- {
- this.auditState = auditState;
- }
-
- public Long getAuditState()
- {
- return auditState;
- }
- public void setCreateUser(Long createUser)
- {
- this.createUser = createUser;
- }
-
- public Long getCreateUser()
- {
- return createUser;
- }
- public void setUpdateUser(Long updateUser)
- {
- this.updateUser = updateUser;
- }
-
- public Long getUpdateUser()
- {
- return updateUser;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("examineName", getExamineName())
- .append("templateId", getTemplateId())
- .append("frequency", getFrequency())
- .append("examineCategory", getExamineCategory())
- .append("alarmScore", getAlarmScore())
- .append("description", getDescription())
- .append("state", getState())
- .append("auditState", getAuditState())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("createUser", getCreateUser())
- .append("updateUser", getUpdateUser())
- .toString();
- }
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
deleted file mode 100644
index 02d972c..0000000
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ycl.platform.domain.entity;
-
-import annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 鑰冩牳缁撴灉瀵硅薄 t_check_result
- *
- * @author ruoyi
- * @date 2024-04-01
- */
-@TableName("t_contract_result")
-@Data
-public class CheckResult {
- private static final long serialVersionUID = 1L;
-
- private Long id;
-
- @Excel(name = "鑰冩牳瀵硅薄")
- private Long unitId;
-
- @Excel(name = "杩愮淮鍚堝悓")
- private Long contractId;
-
- @Excel(name = "鑰冩牳鍙戝竷")
- private Long publishId;
-
- @Excel(name = "鑰冩牳鍒嗘暟")
- private BigDecimal score;
-
- @Excel(name = "鏄惁鍙戝竷")
- private Integer publish;
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鑰冩牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date checkTime;
-
- @TableLogic
- private String deleted;
-
- private Date updateTime;
-}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
index b3ce510..1ead396 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
@@ -2,7 +2,6 @@
import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.platform.domain.entity.CheckResult;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.beans.BeanUtils;
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
deleted file mode 100644
index e69de29..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
+++ /dev/null
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckPublishMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckPublishMapper.java
deleted file mode 100644
index a0206ed..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckPublishMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ycl.platform.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.entity.CheckPublish;
-
-import java.util.List;
-
-/**
- * 鑰冩牳鍙戝竷Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-04-01
- */
-public interface CheckPublishMapper extends BaseMapper<CheckPublish>
-{
- /**
- * 鏌ヨ鑰冩牳鍙戝竷
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 鑰冩牳鍙戝竷
- */
- public CheckPublish selectCheckPublishById(Long id);
-
- /**
- * 鏌ヨ鑰冩牳鍙戝竷鍒楄〃
- *
- * @param checkPublish 鑰冩牳鍙戝竷
- * @return 鑰冩牳鍙戝竷闆嗗悎
- */
- public List<CheckPublish> selectCheckPublishList(CheckPublish checkPublish);
-
- /**
- * 鏂板鑰冩牳鍙戝竷
- *
- * @param checkPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- public int insertCheckPublish(CheckPublish checkPublish);
-
- /**
- * 淇敼鑰冩牳鍙戝竷
- *
- * @param checkPublish 鑰冩牳鍙戝竷
- * @return 缁撴灉
- */
- public int updateCheckPublish(CheckPublish checkPublish);
-
- /**
- * 鍒犻櫎鑰冩牳鍙戝竷
- *
- * @param id 鑰冩牳鍙戝竷涓婚敭
- * @return 缁撴灉
- */
- public int deleteCheckPublishById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳鍙戝竷
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteCheckPublishByIds(Long[] ids);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java
deleted file mode 100644
index b58337a..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.ycl.platform.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.platform.domain.entity.CheckResult;
-import com.ycl.platform.domain.vo.CheckResultVO;
-
-import java.util.List;
-
-/**
- * 鑰冩牳缁撴灉Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-04-01
- */
-public interface CheckResultMapper extends BaseMapper<CheckResult> {
- List<CheckResultVO> selectCheckResultList(CheckResultVO checkResult);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java
deleted file mode 100644
index 01c7078..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICheckResultService.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.ycl.platform.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.platform.domain.entity.CheckResult;
-import com.ycl.platform.domain.entity.ContractResultRecord;
-import com.ycl.platform.domain.vo.CheckResultVO;
-
-import java.util.List;
-
-/**
- * 鑰冩牳缁撴灉Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-04-01
- */
-public interface ICheckResultService extends IService<CheckResult>
-{
- /**
- * 鏌ヨ鑰冩牳缁撴灉
- *
- * @param id 鑰冩牳缁撴灉涓婚敭
- * @return 鑰冩牳缁撴灉
- */
- public CheckResult selectCheckResultById(Long id);
-
- /**
- * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
- *
- * @param checkResult 鑰冩牳缁撴灉
- * @return 鑰冩牳缁撴灉闆嗗悎
- */
- public List<CheckResultVO> selectCheckResultList(CheckResultVO checkResult);
-
- /**
- * 鏂板鑰冩牳缁撴灉
- *
- * @param checkResult 鑰冩牳缁撴灉
- * @return 缁撴灉
- */
- public int insertCheckResult(CheckResult checkResult);
-
- /**
- * 淇敼鑰冩牳缁撴灉
- *
- * @param checkResult 鑰冩牳缁撴灉
- * @return 缁撴灉
- */
- public int updateCheckResult(CheckResult checkResult);
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳缁撴灉涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteCheckResultByIds(Long[] ids);
-
- /**
- * 鍒犻櫎鑰冩牳缁撴灉淇℃伅
- *
- * @param id 鑰冩牳缁撴灉涓婚敭
- * @return 缁撴灉
- */
- public int deleteCheckResultById(Long id);
-
- /**
- * 鎵归噺淇濆瓨鑰冩牳缁撴灉
- * @param contractResultRecord 闆嗗悎
- */
- void saveBatchRecord(List<ContractResultRecord> contractResultRecord);
-
- /**
- * 鏍规嵁鑰冩牳缁撴灉鏌ヨ璁板綍
- * @param resultId 鑰冩牳缁撴灉id
- * @return 鑰冩牳缁撴灉璁板綍
- */
- List<ContractResultRecord> selectCheckResultRecordList(Long resultId);
-
- Boolean publish(Long id);
-}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
deleted file mode 100644
index cdd747c..0000000
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.ycl.platform.service.impl;
-
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.CheckResult;
-import com.ycl.platform.domain.entity.ContractResultRecord;
-import com.ycl.platform.domain.vo.CheckResultVO;
-import com.ycl.platform.mapper.CheckResultMapper;
-import com.ycl.platform.mapper.ContractResultRecordMapper;
-import com.ycl.platform.service.ICheckResultService;
-import com.ycl.platform.service.ITContractService;
-import com.ycl.platform.service.YwUnitService;
-import com.ycl.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import utils.DateUtils;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 鑰冩牳缁撴灉Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2024-04-01
- */
-@Service
-public class CheckResultServiceImpl extends ServiceImpl<CheckResultMapper, CheckResult> implements ICheckResultService {
- @Autowired
- private CheckResultMapper checkResultMapper;
- @Autowired
- private ContractResultRecordMapper contractResultRecordMapper;
- @Autowired
- private YwUnitService unitService;
- @Autowired
- private ITContractService contractService;
-
-
- /**
- * 鏌ヨ鑰冩牳缁撴灉
- *
- * @param id 鑰冩牳缁撴灉涓婚敭
- * @return 鑰冩牳缁撴灉
- */
- @Override
- public CheckResult selectCheckResultById(Long id) {
- return checkResultMapper.selectById(id);
- }
-
- /**
- * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
- *
- * @param checkResult 鑰冩牳缁撴灉
- * @return 鑰冩牳缁撴灉
- */
- @Override
- public List<CheckResultVO> selectCheckResultList(CheckResultVO checkResult) {
- return checkResultMapper.selectCheckResultList(checkResult);
- }
-
- /**
- * 鏂板鑰冩牳缁撴灉
- *
- * @param checkResult 鑰冩牳缁撴灉
- * @return 缁撴灉
- */
- @Override
- public int insertCheckResult(CheckResult checkResult) {
- return checkResultMapper.insert(checkResult);
- }
-
- /**
- * 淇敼鑰冩牳缁撴灉
- *
- * @param checkResult 鑰冩牳缁撴灉
- * @return 缁撴灉
- */
- @Override
- public int updateCheckResult(CheckResult checkResult) {
- checkResult.setUpdateTime(DateUtils.getNowDate());
- return checkResultMapper.updateById(checkResult);
- }
-
- /**
- * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳缁撴灉涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckResultByIds(Long[] ids) {
- return checkResultMapper.deleteBatchIds(Arrays.asList(ids));
- }
-
- /**
- * 鍒犻櫎鑰冩牳缁撴灉淇℃伅
- *
- * @param id 鑰冩牳缁撴灉涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckResultById(Long id) {
- return checkResultMapper.deleteById(id);
- }
-
- @Override
- public void saveBatchRecord(List<ContractResultRecord> contractResultRecord) {
- if (!contractResultRecord.isEmpty()) {
- contractResultRecordMapper.saveBatch(contractResultRecord);
- }
- }
-
- @Override
- public List<ContractResultRecord> selectCheckResultRecordList(Long resultId) {
- return new LambdaQueryChainWrapper<>(contractResultRecordMapper)
- .eq(ContractResultRecord::getResultId, resultId)
- .list();
- }
-
- @Override
- public Boolean publish(Long id) {
- return new LambdaUpdateChainWrapper<>(checkResultMapper)
- .eq(CheckResult::getId, id)
- .set(CheckResult::getPublish, 1)
- .set(CheckResult::getPublishId, SecurityUtils.getLoginUser().getUserId())
- .update();
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
index 758c3a8..5bec0a4 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
@@ -1,10 +1,8 @@
package com.ycl.task;
-import com.ycl.platform.domain.entity.CheckResult;
import com.ycl.platform.domain.entity.ContractResultRecord;
import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.domain.entity.TContract;
-import com.ycl.platform.service.ICheckResultService;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.platform.service.ITContractService;
import com.ycl.utils.DateUtils;
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
deleted file mode 100644
index a0cb132..0000000
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.platform.mapper.CheckResultMapper">
-
-
- <select id="selectCheckResultList" resultType="com.ycl.platform.domain.vo.CheckResultVO">
- SELECT c.*,
- u.unit_name AS unitName,
- ct.name AS contractName
- FROM t_contract_result c
- LEFT JOIN
- t_yw_unit u ON c.unit_id = u.id and u.deleted = '0'
- LEFT JOIN
- t_contract ct ON c.contract_id = ct.id and ct.deleted = '0'
- where
- c.deleted = '0'
- <if test="unitId != null">
- AND c.unit_id = #{unitId}
- </if>
- <if test="createStartTime != null">
- AND c.check_time BETWEEN #{createStartTime} AND #{createEndTime}
- </if>
- <if test="publish != null">
- AND c.publish = #{publish}
- </if>
- </select>
-</mapper>
--
Gitblit v1.8.0