From a90d4c73e67b27338e941f88673fd17fe8b2b5ff Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 30 四月 2024 14:51:43 +0800
Subject: [PATCH] 前后端文件名统一调整
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java | 122 +----------
ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java | 76 ++++--
ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java | 90 +++++---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java | 12 -
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java | 100 ++++++---
ycl-server/src/main/java/com/ycl/task/ContractResultTask.java | 36 +-
ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java | 54 -----
ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 105 ++--------
8 files changed, 224 insertions(+), 371 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
index 8f34f5a..aabaee5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
@@ -1,140 +1,48 @@
package com.ycl.platform.domain.entity;
import annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ycl.system.entity.BaseEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
- * 鍚堝悓鑰冩牳缁撴灉瀵硅薄 t_default_result
+ * 鑰冩牳缁撴灉瀵硅薄 t_check_result
*
* @author ruoyi
* @date 2024-04-01
*/
-public class ContractResult extends BaseEntity
-{
+@TableName("t_contract_result")
+@Data
+public class ContractResult {
private static final long serialVersionUID = 1L;
- /** */
private Long id;
- /** 鑰冩牳鍗曚綅 */
- @Excel(name = "鑰冩牳鍗曚綅")
+ @Excel(name = "鑰冩牳瀵硅薄")
private Long unitId;
- /** 鑰冩牳鍙戝竷 */
+ @Excel(name = "杩愮淮鍚堝悓")
+ private Long contractId;
+
@Excel(name = "鑰冩牳鍙戝竷")
private Long publishId;
- /** 鑰冩牳鍒嗘暟 */
@Excel(name = "鑰冩牳鍒嗘暟")
- private BigDecimal defaultScore;
+ private BigDecimal score;
- /** 瀹℃牳鐘舵�� */
- @Excel(name = "瀹℃牳鐘舵��")
- private Long auditState;
-
- /** 鏄惁鍙戝竷 */
@Excel(name = "鏄惁鍙戝竷")
- private Long publish;
+ private Integer publish;
- /** 鑰冩牳鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鑰冩牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
- /** 閫昏緫鍒犻櫎 */
+ @TableLogic
private String deleted;
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
- public void setUnitId(Long unitId)
- {
- this.unitId = unitId;
- }
-
- public Long getUnitId()
- {
- return unitId;
- }
- public void setPublishId(Long publishId)
- {
- this.publishId = publishId;
- }
-
- public Long getPublishId()
- {
- return publishId;
- }
- public void setDefaultScore(BigDecimal defaultScore)
- {
- this.defaultScore = defaultScore;
- }
-
- public BigDecimal getDefaultScore()
- {
- return defaultScore;
- }
- public void setAuditState(Long auditState)
- {
- this.auditState = auditState;
- }
-
- public Long getAuditState()
- {
- return auditState;
- }
- public void setPublish(Long publish)
- {
- this.publish = publish;
- }
-
- public Long getPublish()
- {
- return publish;
- }
- public void setCheckTime(Date checkTime)
- {
- this.checkTime = checkTime;
- }
-
- public Date getCheckTime()
- {
- return checkTime;
- }
- public void setDeleted(String deleted)
- {
- this.deleted = deleted;
- }
-
- public String getDeleted()
- {
- return deleted;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("unitId", getUnitId())
- .append("publishId", getPublishId())
- .append("defaultScore", getDefaultScore())
- .append("auditState", getAuditState())
- .append("publish", getPublish())
- .append("checkTime", getCheckTime())
- .append("updateTime", getUpdateTime())
- .append("deleted", getDeleted())
- .toString();
- }
+ 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/ContractResultVO.java
similarity index 75%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java
index 1ead396..8e496ec 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/ContractResultVO.java
@@ -4,8 +4,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.experimental.Accessors;
-import org.springframework.beans.BeanUtils;
-import org.springframework.lang.NonNull;
import java.math.BigDecimal;
import java.util.Date;
@@ -15,7 +13,7 @@
*/
@Data
@Accessors(chain = true)
-public class CheckResultVO {
+public class ContractResultVO {
private Long id;
private Long unitId;
@@ -50,13 +48,5 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createEndTime;
-
- public static CheckResultVO getVoByEntity(@NonNull CheckResult entity, CheckResultVO vo) {
- if (vo == null) {
- vo = new CheckResultVO();
- }
- BeanUtils.copyProperties(entity, vo);
- return vo;
- }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
index aac85ac..de16ea7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
@@ -2,6 +2,8 @@
import annotation.Log;
import com.ycl.platform.domain.entity.ContractResult;
+import com.ycl.platform.domain.entity.ContractResultRecord;
+import com.ycl.platform.domain.vo.ContractResultVO;
import com.ycl.platform.service.IContractResultService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -16,83 +18,95 @@
import java.util.List;
/**
- * 鍚堝悓鑰冩牳缁撴灉Controller
+ * 鑰冩牳缁撴灉Controller
*
* @author ruoyi
* @date 2024-04-01
*/
@RestController
@RequestMapping("/contract/result")
-public class ContractResultController extends BaseController
-{
+public class ContractResultController extends BaseController {
@Autowired
- private IContractResultService defaultResultService;
+ private IContractResultService checkResultService;
/**
- * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:result:list')")
- @GetMapping("/list")
- public TableDataInfo list(ContractResult contractResult)
- {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody ContractResultVO contractResult) {
startPage();
- List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult);
+ List<ContractResultVO> list = checkResultService.selectCheckResultList(contractResult);
return getDataTable(list);
}
/**
- * 瀵煎嚭鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:result:export')")
- @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ContractResult contractResult)
- {
- List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult);
- ExcelUtil<ContractResult> util = new ExcelUtil<ContractResult>(ContractResult.class);
- util.exportExcel(response, list, "鍚堝悓鑰冩牳缁撴灉鏁版嵁");
+ @PreAuthorize("@ss.hasPermi('system:result:query')")
+ @GetMapping("/record/list")
+ public TableDataInfo recordList(Long resultId) {
+ List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId);
+ return getDataTable(list);
}
/**
- * 鑾峰彇鍚堝悓鑰冩牳缁撴灉璇︾粏淇℃伅
+ * 瀵煎嚭鑰冩牳缁撴灉鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:export')")
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ContractResultVO contractResult) {
+ List<ContractResultVO> list = checkResultService.selectCheckResultList(contractResult);
+ ExcelUtil<ContractResultVO> util = new ExcelUtil<>(ContractResultVO.class);
+ util.exportExcel(response, list, "鑰冩牳缁撴灉鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鑰冩牳缁撴灉璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('system:result:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(defaultResultService.selectDefaultResultById(id));
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(checkResultService.selectCheckResultById(id));
}
/**
- * 鏂板鍚堝悓鑰冩牳缁撴灉
+ * 鏂板鑰冩牳缁撴灉
*/
@PreAuthorize("@ss.hasPermi('system:result:add')")
- @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ContractResult contractResult)
- {
- return toAjax(defaultResultService.insertDefaultResult(contractResult));
+ public AjaxResult add(@RequestBody ContractResult contractResult) {
+ return toAjax(checkResultService.insertCheckResult(contractResult));
}
/**
- * 淇敼鍚堝悓鑰冩牳缁撴灉
+ * 淇敼鑰冩牳缁撴灉
*/
@PreAuthorize("@ss.hasPermi('system:result:edit')")
- @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ContractResult contractResult)
- {
- return toAjax(defaultResultService.updateDefaultResult(contractResult));
+ public AjaxResult edit(@RequestBody ContractResult contractResult) {
+ return toAjax(checkResultService.updateCheckResult(contractResult));
}
/**
- * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉
+ * 鍙戝竷鑰冩牳缁撴灉
+ */
+ @PreAuthorize("@ss.hasPermi('system:result:publish')")
+ @PutMapping("/publish/{id}")
+ public AjaxResult publish(@PathVariable("id") Long id) {
+ return toAjax(checkResultService.publish(id));
+ }
+
+ /**
+ * 鍒犻櫎鑰冩牳缁撴灉
*/
@PreAuthorize("@ss.hasPermi('system:result:remove')")
- @Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(defaultResultService.deleteDefaultResultByIds(ids));
+ @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(checkResultService.deleteCheckResultByIds(ids));
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
index ba950e5..77b69c4 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ContractResultMapper.java
@@ -2,62 +2,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.ContractResult;
+import com.ycl.platform.domain.vo.ContractResultVO;
import java.util.List;
/**
- * 鍚堝悓鑰冩牳缁撴灉Mapper鎺ュ彛
+ * 鑰冩牳缁撴灉Mapper鎺ュ彛
*
* @author ruoyi
* @date 2024-04-01
*/
-public interface ContractResultMapper extends BaseMapper<ContractResult>
-{
- /**
- * 鏌ヨ鍚堝悓鑰冩牳缁撴灉
- *
- * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
- * @return 鍚堝悓鑰冩牳缁撴灉
- */
- public ContractResult selectDefaultResultById(Long id);
-
- /**
- * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
- *
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
- * @return 鍚堝悓鑰冩牳缁撴灉闆嗗悎
- */
- public List<ContractResult> selectDefaultResultList(ContractResult contractResult);
-
- /**
- * 鏂板鍚堝悓鑰冩牳缁撴灉
- *
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
- * @return 缁撴灉
- */
- public int insertDefaultResult(ContractResult contractResult);
-
- /**
- * 淇敼鍚堝悓鑰冩牳缁撴灉
- *
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
- * @return 缁撴灉
- */
- public int updateDefaultResult(ContractResult contractResult);
-
- /**
- * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉
- *
- * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
- * @return 缁撴灉
- */
- public int deleteDefaultResultById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteDefaultResultByIds(Long[] ids);
+public interface ContractResultMapper extends BaseMapper<ContractResult> {
+ List<ContractResultVO> selectCheckResultList(ContractResultVO checkResult);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
index d5cf9f1..3faed01 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
@@ -1,62 +1,80 @@
package com.ycl.platform.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.ContractResult;
+import com.ycl.platform.domain.entity.ContractResultRecord;
+import com.ycl.platform.domain.vo.ContractResultVO;
import java.util.List;
/**
- * 鍚堝悓鑰冩牳缁撴灉Service鎺ュ彛
- *
+ * 鑰冩牳缁撴灉Service鎺ュ彛
+ *
* @author ruoyi
* @date 2024-04-01
*/
-public interface IContractResultService
+public interface IContractResultService extends IService<ContractResult>
{
/**
- * 鏌ヨ鍚堝悓鑰冩牳缁撴灉
- *
- * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
- * @return 鍚堝悓鑰冩牳缁撴灉
+ * 鏌ヨ鑰冩牳缁撴灉
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 鑰冩牳缁撴灉
*/
- public ContractResult selectDefaultResultById(Long id);
+ public ContractResult selectCheckResultById(Long id);
/**
- * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
- *
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
- * @return 鍚堝悓鑰冩牳缁撴灉闆嗗悎
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
+ *
+ * @param checkResult 鑰冩牳缁撴灉
+ * @return 鑰冩牳缁撴灉闆嗗悎
*/
- public List<ContractResult> selectDefaultResultList(ContractResult contractResult);
+ public List<ContractResultVO> selectCheckResultList(ContractResultVO checkResult);
/**
- * 鏂板鍚堝悓鑰冩牳缁撴灉
- *
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
+ * 鏂板鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
* @return 缁撴灉
*/
- public int insertDefaultResult(ContractResult contractResult);
+ public int insertCheckResult(ContractResult checkResult);
/**
- * 淇敼鍚堝悓鑰冩牳缁撴灉
- *
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
+ * 淇敼鑰冩牳缁撴灉
+ *
+ * @param checkResult 鑰冩牳缁撴灉
* @return 缁撴灉
*/
- public int updateDefaultResult(ContractResult contractResult);
+ public int updateCheckResult(ContractResult checkResult);
/**
- * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
- *
- * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳缁撴灉涓婚敭闆嗗悎
+ * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳缁撴灉涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteDefaultResultByIds(Long[] ids);
+ public int deleteCheckResultByIds(Long[] ids);
/**
- * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉淇℃伅
- *
- * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * 鍒犻櫎鑰冩牳缁撴灉淇℃伅
+ *
+ * @param id 鑰冩牳缁撴灉涓婚敭
* @return 缁撴灉
*/
- public int deleteDefaultResultById(Long id);
+ 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/ContractResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
index cc566b8..4a77bd9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -1,97 +1,125 @@
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.ContractResult;
+import com.ycl.platform.domain.entity.ContractResultRecord;
+import com.ycl.platform.domain.vo.ContractResultVO;
import com.ycl.platform.mapper.ContractResultMapper;
+import com.ycl.platform.mapper.ContractResultRecordMapper;
import com.ycl.platform.service.IContractResultService;
+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涓氬姟灞傚鐞�
+ * 鑰冩牳缁撴灉Service涓氬姟灞傚鐞�
*
* @author ruoyi
* @date 2024-04-01
*/
@Service
-public class ContractResultServiceImpl extends ServiceImpl<ContractResultMapper, ContractResult> implements IContractResultService
-{
+public class ContractResultServiceImpl extends ServiceImpl<ContractResultMapper, ContractResult> implements IContractResultService {
@Autowired
- private ContractResultMapper contractResultMapper;
+ private ContractResultMapper checkResultMapper;
+ @Autowired
+ private ContractResultRecordMapper contractResultRecordMapper;
+
/**
- * 鏌ヨ鍚堝悓鑰冩牳缁撴灉
+ * 鏌ヨ鑰冩牳缁撴灉
*
- * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
- * @return 鍚堝悓鑰冩牳缁撴灉
+ * @param id 鑰冩牳缁撴灉涓婚敭
+ * @return 鑰冩牳缁撴灉
*/
@Override
- public ContractResult selectDefaultResultById(Long id)
- {
- return contractResultMapper.selectDefaultResultById(id);
+ public ContractResult selectCheckResultById(Long id) {
+ return checkResultMapper.selectById(id);
}
/**
- * 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
+ * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
*
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
- * @return 鍚堝悓鑰冩牳缁撴灉
+ * @param contractResult 鑰冩牳缁撴灉
+ * @return 鑰冩牳缁撴灉
*/
@Override
- public List<ContractResult> selectDefaultResultList(ContractResult contractResult)
- {
- return contractResultMapper.selectDefaultResultList(contractResult);
+ public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) {
+ return checkResultMapper.selectCheckResultList(contractResult);
}
/**
- * 鏂板鍚堝悓鑰冩牳缁撴灉
+ * 鏂板鑰冩牳缁撴灉
*
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
+ * @param contractResult 鑰冩牳缁撴灉
* @return 缁撴灉
*/
@Override
- public int insertDefaultResult(ContractResult contractResult)
- {
- return contractResultMapper.insertDefaultResult(contractResult);
+ public int insertCheckResult(ContractResult contractResult) {
+ return checkResultMapper.insert(contractResult);
}
/**
- * 淇敼鍚堝悓鑰冩牳缁撴灉
+ * 淇敼鑰冩牳缁撴灉
*
- * @param contractResult 鍚堝悓鑰冩牳缁撴灉
+ * @param contractResult 鑰冩牳缁撴灉
* @return 缁撴灉
*/
@Override
- public int updateDefaultResult(ContractResult contractResult)
- {
+ public int updateCheckResult(ContractResult contractResult) {
contractResult.setUpdateTime(DateUtils.getNowDate());
- return contractResultMapper.updateDefaultResult(contractResult);
+ return checkResultMapper.updateById(contractResult);
}
/**
- * 鎵归噺鍒犻櫎鍚堝悓鑰冩牳缁撴灉
+ * 鎵归噺鍒犻櫎鑰冩牳缁撴灉
*
- * @param ids 闇�瑕佸垹闄ょ殑鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳缁撴灉涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteDefaultResultByIds(Long[] ids)
- {
- return contractResultMapper.deleteDefaultResultByIds(ids);
+ public int deleteCheckResultByIds(Long[] ids) {
+ return checkResultMapper.deleteBatchIds(Arrays.asList(ids));
}
/**
- * 鍒犻櫎鍚堝悓鑰冩牳缁撴灉淇℃伅
+ * 鍒犻櫎鑰冩牳缁撴灉淇℃伅
*
- * @param id 鍚堝悓鑰冩牳缁撴灉涓婚敭
+ * @param id 鑰冩牳缁撴灉涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteDefaultResultById(Long id)
- {
- return contractResultMapper.deleteDefaultResultById(id);
+ 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(ContractResult::getId, id)
+ .set(ContractResult::getPublish, 1)
+ .set(ContractResult::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 5bec0a4..d1b5021 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
@@ -1,8 +1,10 @@
package com.ycl.task;
+import com.ycl.platform.domain.entity.ContractResult;
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.IContractResultService;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.platform.service.ITContractService;
import com.ycl.utils.DateUtils;
@@ -28,7 +30,7 @@
private final ITContractService contractService;
private final IContractScoreService contractScoreService;
- private final ICheckResultService checkResultService;
+ private final IContractResultService checkResultService;
private String startTime;
private String endTime;
@@ -47,10 +49,10 @@
// 涓婁釜鏈堟墸鍒嗚褰�
List<ContractScore> contractScore = contractScoreService.getDateRangeScoreByContractId(tContract.getId(), startTime, endTime);
// 鏂板鑰冩牳缁撴灉
- CheckResult checkResult = getCheckResult(tContract, contractScore);
- checkResultService.save(checkResult);
+ ContractResult contractResult = getCheckResult(tContract, contractScore);
+ checkResultService.save(contractResult);
// 鏂板鑰冩牳缁撴灉璁板綍
- List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, checkResult);
+ List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, contractResult);
checkResultService.saveBatchRecord(contractResultRecord);
}
}
@@ -58,16 +60,16 @@
/**
* 淇濆瓨鑰冩牳璁板綍
*
- * @param contractScore 鎵ｅ垎
- * @param checkResult 鑰冩牳缁撴灉
+ * @param contractScore 鎵ｅ垎
+ * @param contractResult 鑰冩牳缁撴灉
* @return 鑰冩牳璁板綍
*/
- private List<ContractResultRecord> getContractResultRecord(List<ContractScore> contractScore, CheckResult checkResult) {
+ private List<ContractResultRecord> getContractResultRecord(List<ContractScore> contractScore, ContractResult contractResult) {
return contractScore.stream().map(
item -> {
ContractResultRecord record = new ContractResultRecord();
BeanUtils.copyProperties(item, record);
- record.setResultId(checkResult.getId());
+ record.setResultId(contractResult.getId());
record.setCreateTime(DateUtils.getNowDate());
return record;
}
@@ -81,15 +83,15 @@
* @param contractScore 鎵ｅ垎
* @return 鑰冩牳缁撴灉
*/
- private CheckResult getCheckResult(TContract tContract, List<ContractScore> contractScore) {
- CheckResult checkResult = new CheckResult();
- checkResult.setUnitId(tContract.getUnitId());
- checkResult.setContractId(tContract.getId());
- checkResult.setPublish(0);
- checkResult.setDeleted("0");
- checkResult.setCheckTime(DateUtils.getNowDate());
- checkResult.setScore(contractScore.isEmpty() ? new BigDecimal("100") : new BigDecimal("100").subtract(contractScore.stream().map(ContractScore::getScore).reduce(BigDecimal::add).get()));
- return checkResult;
+ private ContractResult getCheckResult(TContract tContract, List<ContractScore> contractScore) {
+ ContractResult contractResult = new ContractResult();
+ contractResult.setUnitId(tContract.getUnitId());
+ contractResult.setContractId(tContract.getId());
+ contractResult.setPublish(0);
+ contractResult.setDeleted("0");
+ contractResult.setCheckTime(DateUtils.getNowDate());
+ contractResult.setScore(contractScore.isEmpty() ? new BigDecimal("100") : new BigDecimal("100").subtract(contractScore.stream().map(ContractScore::getScore).reduce(BigDecimal::add).get()));
+ return contractResult;
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
index 83e5b33..9ff0965 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
@@ -1,88 +1,27 @@
-<?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">
+<?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.ContractResultMapper">
- <resultMap type="com.ycl.platform.domain.entity.ContractResult" id="DefaultResultResult">
- <result property="id" column="id" />
- <result property="unitId" column="unit_id" />
- <result property="publishId" column="publish_id" />
- <result property="contractScore" column="default_score" />
- <result property="auditState" column="audit_state" />
- <result property="publish" column="publish" />
- <result property="checkTime" column="check_time" />
- <result property="updateTime" column="update_time" />
- <result property="deleted" column="deleted" />
- </resultMap>
- <sql id="selectDefaultResultVo">
- select id, unit_id, publish_id, default_score, audit_state, publish, check_time, update_time, deleted from t_contract_result
- </sql>
-
- <select id="selectDefaultResultList" resultMap="DefaultResultResult">
- <include refid="selectDefaultResultVo"/>
- <where>
- <if test="unitId != null "> and unit_id = #{unitId}</if>
- <if test="publishId != null "> and publish_id = #{publishId}</if>
- <if test="auditState != null "> and audit_state = #{auditState}</if>
- <if test="publish != null "> and publish = #{publish}</if>
- <if test="checkTime != null "> and check_time = #{checkTime}</if>
- </where>
+ <select id="selectCheckResultList" resultType="com.ycl.platform.domain.vo.ContractResultVO">
+ 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>
-
- <select id="selectDefaultResultById" resultMap="DefaultResultResult">
- <include refid="selectDefaultResultVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertDefaultResult" useGeneratedKeys="true" keyProperty="id">
- insert into t_contract_result
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="unitId != null">unit_id,</if>
- <if test="publishId != null">publish_id,</if>
- <if test="contractScore != null">default_score,</if>
- <if test="auditState != null">audit_state,</if>
- <if test="publish != null">publish,</if>
- <if test="checkTime != null">check_time,</if>
- <if test="updateTime != null">update_time,</if>
- <if test="deleted != null">deleted,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="unitId != null">#{unitId},</if>
- <if test="publishId != null">#{publishId},</if>
- <if test="contractScore != null">#{contractScore},</if>
- <if test="auditState != null">#{auditState},</if>
- <if test="publish != null">#{publish},</if>
- <if test="checkTime != null">#{checkTime},</if>
- <if test="updateTime != null">#{updateTime},</if>
- <if test="deleted != null">#{deleted},</if>
- </trim>
- </insert>
-
- <update id="updateDefaultResult" >
- update t_contract_result
- <trim prefix="SET" suffixOverrides=",">
- <if test="unitId != null">unit_id = #{unitId},</if>
- <if test="publishId != null">publish_id = #{publishId},</if>
- <if test="contractScore != null">default_score = #{contractScore},</if>
- <if test="auditState != null">audit_state = #{auditState},</if>
- <if test="publish != null">publish = #{publish},</if>
- <if test="checkTime != null">check_time = #{checkTime},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="deleted != null">deleted = #{deleted},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteDefaultResultById">
- delete from t_contract_result where id = #{id}
- </delete>
-
- <delete id="deleteDefaultResultByIds" >
- delete from t_contract_result where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
</mapper>
--
Gitblit v1.8.0