模型评价更新

ruoyi-admin/src/test/java/com/ruoyi/JasyptTest.java

@@ -83,18 +83,9 @@ public class JasyptTest {
 
         });*/
 
-        List<SysDept> sysDepts = deptService.selectDeptList(null);
+        String encrypt = sm4Util.encrypt("15666666666");
 
-        sysDepts.forEach(p->{
-            p.setPhone(sm4Util.encrypt(p.getPhone()));
-            deptService.updateDept(p);
-
-        });
-        List<SysUser> sysUsers = userService.selectUserList(null);
-        sysUsers.forEach(p->{
-            p.setPhonenumber(sm4Util.encrypt(p.getPhonenumber()));
-            userService.updateUser(p);
-        });
+        System.out.println(encrypt);
 
     }
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdEstimateController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.interfaces.domain.MdEstimate;
 import com.ruoyi.interfaces.domain.MdModelInfo;
 import com.ruoyi.interfaces.domain.vo.MdEstimateMdVo;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/md/estimate")
@@ -69,9 +71,24 @@ public class MdEstimateController extends BaseController {
      */
     @Log(title = "模型应用流程", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MdEstimate mdEstimate)
+    public AjaxResult add(@RequestBody List<MdEstimate> mdEstimates)
     {
-        return toAjax(mdEstimateService.insertMdEstimate(mdEstimate));
+
+
+        mdEstimates = mdEstimates.stream()
+                .filter(p-> StringUtils.isNotNull(p.getMdid()))
+                .filter(p-> StringUtils.isNotNull(p.getEstimateScore()))
+                .filter(p-> StringUtils.isNotNull(p.getEstimateType()))
+                .filter(p-> StringUtils.isNotNull(p.getEstimateTime()))
+                        .collect(Collectors.toList());
+        if (StringUtils.isEmpty(mdEstimates)) {
+            return AjaxResult.error();
+        }
+        MdEstimate mdEstimate = mdEstimates.get(0);
+        mdEstimateService.deleteMdEstimateByMdidAndEstimateTime(mdEstimate);
+
+        mdEstimates.forEach(mdEstimateService::insertMdEstimate);
+        return toAjax(1);
     }
 
     /**

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdEstimateFirmlyController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.interfaces.controller;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.interfaces.domain.MdEstimateFirmly;
+import com.ruoyi.interfaces.domain.vo.MdEstimateFirmlyVo;
+import com.ruoyi.interfaces.service.IMdEstimateFirmlyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 模型评价认定Controller
+ *
+ * @author ruoyi
+ * @date 2025-10-28
+ */
+@RestController
+@RequestMapping("/estimate/firmly")
+public class MdEstimateFirmlyController extends BaseController
+{
+    @Autowired
+    private IMdEstimateFirmlyService mdEstimateFirmlyService;
+
+    /**
+     * 查询模型评价认定列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(MdEstimateFirmly mdEstimateFirmly)
+    {
+        startPage();
+        List<MdEstimateFirmly> list = mdEstimateFirmlyService.selectMdEstimateFirmlyList(mdEstimateFirmly);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/mdList")
+    public TableDataInfo mdList(MdEstimateFirmlyVo par)
+    {
+        startPage();
+        List<MdEstimateFirmlyVo> list = mdEstimateFirmlyService.selectMdEstimateFirmlyVoList(par);
+        list.forEach(item->{
+            if (StringUtils.isNull(item.getFirmlyYr()))
+                item.setFirmlyYr(par.getFirmlyYr());
+        });
+        return getDataTable(list);
+    }
+    /**
+     * 模型评价认定
+     * @return
+     */
+    @PostMapping("/firmly")
+    public AjaxResult firmly(@RequestBody MdEstimateFirmly estimateFirmly){
+        estimateFirmly.setCreateBy(getUsername());
+        return success(mdEstimateFirmlyService.firmly(estimateFirmly));
+    }
+
+
+    /**
+     * 导出模型评价认定列表
+     */
+    @Log(title = "模型评价认定", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MdEstimateFirmly mdEstimateFirmly)
+    {
+        List<MdEstimateFirmly> list = mdEstimateFirmlyService.selectMdEstimateFirmlyList(mdEstimateFirmly);
+        ExcelUtil<MdEstimateFirmly> util = new ExcelUtil<MdEstimateFirmly>(MdEstimateFirmly.class);
+        return util.exportExcel(list, "模型评价认定数据");
+    }
+
+    /**
+     * 获取模型评价认定详细信息
+     */
+    @GetMapping(value = "/getInfo")
+    public AjaxResult getInfo(MdEstimateFirmly mdEstimateFirmly)
+    {
+        return AjaxResult.success(mdEstimateFirmlyService.selectMdEstimateFirmlyByMdid(mdEstimateFirmly.getMdid(), mdEstimateFirmly.getFirmlyYr()));
+    }
+
+    /**
+     * 新增模型评价认定
+     */
+    @Log(title = "模型评价认定", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MdEstimateFirmly mdEstimateFirmly)
+    {
+        return toAjax(mdEstimateFirmlyService.insertMdEstimateFirmly(mdEstimateFirmly));
+    }
+
+    /**
+     * 修改模型评价认定
+     */
+    @Log(title = "模型评价认定", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MdEstimateFirmly mdEstimateFirmly)
+    {
+        return toAjax(mdEstimateFirmlyService.updateMdEstimateFirmly(mdEstimateFirmly));
+    }
+
+    /**
+     * 删除模型评价认定
+     */
+    @Log(title = "模型评价认定", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{mdids}")
+    public AjaxResult remove(@PathVariable String[] mdids)
+    {
+        return toAjax(mdEstimateFirmlyService.deleteMdEstimateFirmlyByMdids(mdids));
+    }
+}

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdEstimate.java

@@ -2,7 +2,6 @@ package com.ruoyi.interfaces.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
 
 import java.util.Date;
 
@@ -16,24 +15,29 @@ public class MdEstimate extends BaseEntity {
      */
     private String mdid;
     /**
-     * 评分；S,A,B,C,;
+     * 评分；
      */
     private String estimateScore;
     /**
-     * 评价项目；比如响应数据，数据准确性,;
+     * USE 使用指标；EFF 效率指标；SUP 补充指标
+     * 评价项目；
      */
     private String estimateType;
     /**
-     * 评价生效开始日期,;
+     * 评价年份,;
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date beginTime;
+    private Date estimateTime;
+    /*
+     */
+
     /**
      * 评价生效结束日期,;
-     */
+     *//*
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
-
+*/
     public Integer getEstimateId() {
         return estimateId;
     }
@@ -66,21 +70,14 @@ public class MdEstimate extends BaseEntity {
         this.estimateType = estimateType;
     }
 
-    public Date getBeginTime() {
-        return beginTime;
-    }
-
-    public void setBeginTime(Date beginTime) {
-        this.beginTime = beginTime;
+    public Date getEstimateTime() {
+        return estimateTime;
     }
 
-    public Date getEndTime() {
-        return endTime;
+    public void setEstimateTime(Date estimateTime) {
+        this.estimateTime = estimateTime;
     }
 
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
 
     public MdEstimate() {
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdEstimateFirmly.java

@@ -0,0 +1,49 @@
+package com.ruoyi.interfaces.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MdEstimateFirmly extends BaseEntity {
+    /**
+     * 认定id,;
+     */
+    private Integer firmlyId;
+    /**
+     * 模型id,;
+     */
+    private String mdid;
+    /**
+     * 认定年份,;
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date firmlyYr;
+    /**
+     * 认定结果,;
+     */
+    private String firmlyConfirm;
+    /**
+     * 0 直接认定；1 = 评分认定
+     * 认定类型,;
+     */
+    private String firmlyType;
+    /**
+     *
+     *
+     * 认定状态,;
+     */
+    private String firmlyState;
+    /**
+     * 认定人,;
+     */
+    private String createBy;
+    /**
+     * 认定时间,;
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+}

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/vo/MdEstimateFirmlyVo.java

@@ -0,0 +1,11 @@
+package com.ruoyi.interfaces.domain.vo;
+
+import com.ruoyi.interfaces.domain.MdEstimateFirmly;
+import lombok.Data;
+
+@Data
+public class MdEstimateFirmlyVo extends MdEstimateFirmly {
+    private String mdid;
+    private String mdName;
+    private String devkind;
+}

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdEstimateFirmlyMapper.java

@@ -0,0 +1,71 @@
+package com.ruoyi.interfaces.mapper;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.interfaces.domain.MdEstimateFirmly;
+import com.ruoyi.interfaces.domain.vo.MdEstimateFirmlyVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 模型评价认定Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-10-28
+ */
+@Mapper
+@DataSource(DataSourceType.SLAVE)
+public interface MdEstimateFirmlyMapper {
+    /**
+     * 查询模型评价认定
+     *
+     * @param mdid 模型评价认定主键
+     * @return 模型评价认定
+     */
+    public MdEstimateFirmly selectMdEstimateFirmlyByMdidAndFirmlyYr(@Param("mdid") String mdid, @Param("firmlyYr") Date firmlyYr);
+
+    /**
+     * 查询模型评价认定列表
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 模型评价认定集合
+     */
+    public List<MdEstimateFirmly> selectMdEstimateFirmlyList(MdEstimateFirmly mdEstimateFirmly);
+
+    /**
+     * 新增模型评价认定
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 结果
+     */
+    public int insertMdEstimateFirmly(MdEstimateFirmly mdEstimateFirmly);
+
+    /**
+     * 修改模型评价认定
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 结果
+     */
+    public int updateMdEstimateFirmly(MdEstimateFirmly mdEstimateFirmly);
+
+    /**
+     * 删除模型评价认定
+     *
+     * @param mdid 模型评价认定主键
+     * @return 结果
+     */
+    public int deleteMdEstimateFirmlyByMdid(String mdid);
+
+    /**
+     * 批量删除模型评价认定
+     *
+     * @param mdids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMdEstimateFirmlyByMdids(String[] mdids);
+
+    List<MdEstimateFirmlyVo> selectMdEstimateFirmlyVoList(MdEstimateFirmlyVo par);
+}

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdEstimateMapper.java

@@ -64,4 +64,6 @@ public interface MdEstimateMapper
      * @return 结果
      */
     public int deleteMdEstimateByEstimateIds(Long[] estimateIds);
+
+    int deleteMdEstimateByMdidAndEstimateTime(MdEstimate mdEstimate);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdEstimateFirmlyService.java

@@ -0,0 +1,67 @@
+package com.ruoyi.interfaces.service;
+import com.ruoyi.interfaces.domain.MdEstimateFirmly;
+import com.ruoyi.interfaces.domain.vo.MdEstimateFirmlyVo;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 模型评价认定Service接口
+ *
+ * @author ruoyi
+ * @date 2025-10-28
+ */
+public interface IMdEstimateFirmlyService
+{
+    /**
+     * 查询模型评价认定
+     *
+     * @param mdid 模型评价认定主键
+     * @return 模型评价认定
+     */
+    public MdEstimateFirmly selectMdEstimateFirmlyByMdid(String mdid, Date firmlyYr);
+
+    /**
+     * 查询模型评价认定列表
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 模型评价认定集合
+     */
+    public List<MdEstimateFirmly> selectMdEstimateFirmlyList(MdEstimateFirmly mdEstimateFirmly);
+
+    /**
+     * 新增模型评价认定
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 结果
+     */
+    public int insertMdEstimateFirmly(MdEstimateFirmly mdEstimateFirmly);
+
+    /**
+     * 修改模型评价认定
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 结果
+     */
+    public int updateMdEstimateFirmly(MdEstimateFirmly mdEstimateFirmly);
+
+    /**
+     * 批量删除模型评价认定
+     *
+     * @param mdids 需要删除的模型评价认定主键集合
+     * @return 结果
+     */
+    public int deleteMdEstimateFirmlyByMdids(String[] mdids);
+
+    /**
+     * 删除模型评价认定信息
+     *
+     * @param mdid 模型评价认定主键
+     * @return 结果
+     */
+    public int deleteMdEstimateFirmlyByMdid(String mdid);
+
+    List<MdEstimateFirmlyVo> selectMdEstimateFirmlyVoList(MdEstimateFirmlyVo par);
+
+    String firmly(MdEstimateFirmly estimateFirmly);
+}

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdEstimateService.java

@@ -53,4 +53,6 @@ public interface IMdEstimateService {
      * @return 结果
      */
     public int deleteMdEstimateByEstimateId(Long estimateId);
+
+    int deleteMdEstimateByMdidAndEstimateTime(MdEstimate mdEstimate);
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdEstimateFirmlyServiceImpl.java

@@ -0,0 +1,163 @@
+package com.ruoyi.interfaces.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.utils.Arith;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.interfaces.domain.MdEstimate;
+import com.ruoyi.interfaces.domain.MdEstimateFirmly;
+import com.ruoyi.interfaces.domain.vo.MdEstimateFirmlyVo;
+import com.ruoyi.interfaces.mapper.MdEstimateFirmlyMapper;
+import com.ruoyi.interfaces.mapper.MdEstimateMapper;
+import com.ruoyi.interfaces.service.IMdEstimateFirmlyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模型评价认定Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-10-28
+ */
+@Service
+public class MdEstimateFirmlyServiceImpl implements IMdEstimateFirmlyService {
+    @Autowired
+    private MdEstimateFirmlyMapper mdEstimateFirmlyMapper;
+
+    @Autowired
+    private MdEstimateMapper mdEstimateMapper;
+
+
+    /**
+     * 查询模型评价认定
+     *
+     * @param mdid 模型评价认定主键
+     * @return 模型评价认定
+     */
+    @Override
+    public MdEstimateFirmly selectMdEstimateFirmlyByMdid(String mdid, Date firmlyYr) {
+        return mdEstimateFirmlyMapper.selectMdEstimateFirmlyByMdidAndFirmlyYr(mdid,firmlyYr);
+    }
+
+    /**
+     * 查询模型评价认定列表
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 模型评价认定
+     */
+    @Override
+    public List<MdEstimateFirmly> selectMdEstimateFirmlyList(MdEstimateFirmly mdEstimateFirmly) {
+        return mdEstimateFirmlyMapper.selectMdEstimateFirmlyList(mdEstimateFirmly);
+    }
+
+    /**
+     * 新增模型评价认定
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 结果
+     */
+    @Override
+    public int insertMdEstimateFirmly(MdEstimateFirmly mdEstimateFirmly) {
+        mdEstimateFirmly.setCreateTime(DateUtils.getNowDate());
+        return mdEstimateFirmlyMapper.insertMdEstimateFirmly(mdEstimateFirmly);
+    }
+
+    /**
+     * 修改模型评价认定
+     *
+     * @param mdEstimateFirmly 模型评价认定
+     * @return 结果
+     */
+    @Override
+    public int updateMdEstimateFirmly(MdEstimateFirmly mdEstimateFirmly) {
+        return mdEstimateFirmlyMapper.updateMdEstimateFirmly(mdEstimateFirmly);
+    }
+
+    /**
+     * 批量删除模型评价认定
+     *
+     * @param mdids 需要删除的模型评价认定主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMdEstimateFirmlyByMdids(String[] mdids) {
+        return mdEstimateFirmlyMapper.deleteMdEstimateFirmlyByMdids(mdids);
+    }
+
+    /**
+     * 删除模型评价认定信息
+     *
+     * @param mdid 模型评价认定主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMdEstimateFirmlyByMdid(String mdid) {
+        return mdEstimateFirmlyMapper.deleteMdEstimateFirmlyByMdid(mdid);
+    }
+
+    /**
+     * 查询附带模型信息的评价认定列表
+     *
+     * @param par
+     * @return
+     */
+    @Override
+    public List<MdEstimateFirmlyVo> selectMdEstimateFirmlyVoList(MdEstimateFirmlyVo par) {
+        return mdEstimateFirmlyMapper.selectMdEstimateFirmlyVoList(par);
+    }
+
+    /**
+     *
+     * @param estimateFirmly
+     * @return
+     */
+    @Override
+    public String firmly(MdEstimateFirmly estimateFirmly) {
+        MdEstimateFirmly mdEstimateFirmly = mdEstimateFirmlyMapper.selectMdEstimateFirmlyByMdidAndFirmlyYr(estimateFirmly.getMdid(), estimateFirmly.getFirmlyYr());
+
+        if (estimateFirmly.getFirmlyType().equals("1")) {
+            estimateFirmly.setFirmlyConfirm(estimateFirmly(estimateFirmly).toString());
+        }
+
+        estimateFirmly.setCreateTime(DateUtils.getDateDD(DateUtils.getNowDate()));
+        if (StringUtils.isNull(mdEstimateFirmly)) {
+            estimateFirmly.setFirmlyState("1");
+            mdEstimateFirmlyMapper.insertMdEstimateFirmly(estimateFirmly);
+        } else {
+            mdEstimateFirmly.setCreateBy(estimateFirmly.getCreateBy());
+            mdEstimateFirmly.setCreateTime(estimateFirmly.getCreateTime());
+            mdEstimateFirmlyMapper.updateMdEstimateFirmly(mdEstimateFirmly);
+        }
+        return "认定成功";
+    }
+
+    /**
+     * 评分认定方法
+     */
+    public Integer estimateFirmly(MdEstimateFirmly estimateFirmly) {
+        MdEstimate mdEstimate = new MdEstimate();
+        mdEstimate.setMdid(estimateFirmly.getMdid());
+        mdEstimate.setEstimateTime(estimateFirmly.getFirmlyYr());
+        List<MdEstimate> mdEstimates = mdEstimateMapper.selectMdEstimateList(mdEstimate);
+
+        Integer score = 0;
+
+        Integer scoreNum = 0;
+
+        for (MdEstimate estimate : mdEstimates) {
+            if (StringUtils.isNotEmpty(estimate.getEstimateScore())) {
+                score += Integer.parseInt(estimate.getEstimateScore());
+                scoreNum++;
+            }
+        }
+        if (scoreNum == 0) {
+            return 0;
+        } else {
+            return (int) Arith.div(score, scoreNum, 0);
+        }
+    }
+
+
+}

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdEstimateServiceImpl.java

@@ -88,4 +88,9 @@ public class MdEstimateServiceImpl implements IMdEstimateService {
     {
         return mdEstimateMapper.deleteMdEstimateByEstimateId(estimateId);
     }
+
+    @Override
+    public int deleteMdEstimateByMdidAndEstimateTime(MdEstimate mdEstimate) {
+        return mdEstimateMapper.deleteMdEstimateByMdidAndEstimateTime(mdEstimate);
+    }
 }

ruoyi-api-patform/src/main/resources/mapper/interfaces/MdEstimateFirmlyMapper.xml

@@ -0,0 +1,127 @@
+<?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.ruoyi.interfaces.mapper.MdEstimateFirmlyMapper">
+
+    <resultMap type="com.ruoyi.interfaces.domain.MdEstimateFirmly" id="MdEstimateFirmlyResult">
+        <result property="firmlyId" column="firmly_id"/>
+        <result property="mdid" column="mdid"/>
+        <result property="firmlyYr" column="firmly_yr"/>
+        <result property="firmlyConfirm" column="firmly_confirm"/>
+        <result property="firmlyType" column="firmly_type"/>
+        <result property="firmlyState" column="firmly_state"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <sql id="selectMdEstimateFirmlyVo">
+        select firmly_id,
+               mdid,
+               firmly_yr,
+               firmly_confirm,
+               firmly_type,
+               firmly_state,
+               create_by,
+               create_time
+        from md_estimate_firmly
+    </sql>
+
+    <select id="selectMdEstimateFirmlyList" parameterType="com.ruoyi.interfaces.domain.MdEstimateFirmly"
+            resultMap="MdEstimateFirmlyResult">
+        <include refid="selectMdEstimateFirmlyVo"/>
+        <where>
+            <if test="firmlyId != null ">and firmly_id = #{firmlyId}</if>
+            <if test="mdid != null ">and mdid = #{mdid}</if>
+            <if test="firmlyYr != null ">and firmly_yr = #{firmlyYr}</if>
+            <if test="firmlyConfirm != null  and firmlyConfirm != ''">and firmly_confirm = #{firmlyConfirm}</if>
+            <if test="firmlyType != null  and firmlyType != ''">and firmly_type = #{firmlyType}</if>
+            <if test="firmlyState != null  and firmlyState != ''">and firmly_state = #{firmlyState}</if>
+        </where>
+    </select>
+
+    <select id="selectMdEstimateFirmlyByMdidAndFirmlyYr" resultMap="MdEstimateFirmlyResult">
+        <include refid="selectMdEstimateFirmlyVo"/>
+        where mdid = #{mdid}
+        and firmly_Yr = #{firmlyYr}
+    </select>
+    <select id="selectMdEstimateFirmlyVoList" resultType="com.ruoyi.interfaces.domain.vo.MdEstimateFirmlyVo">
+        SELECT m.mdid,
+        m.name AS md_name,
+        m.devkind,
+        ef.firmly_id,
+        ef.firmly_yr,
+        ef.firmly_confirm,
+        ef.firmly_type,
+        ef.firmly_state,
+        ef.create_by,
+        ef.create_time
+        FROM md_model_info m
+        LEFT JOIN
+        (select * from md_estimate_firmly ef
+        <where>
+            <if test="firmlyId != null ">and ef.firmly_id = #{firmlyId}</if>
+            <if test="mdid != null ">and ef.mdid = #{mdid}</if>
+            <if test="firmlyYr != null ">and ef.firmly_yr = #{firmlyYr}</if>
+            <if test="firmlyConfirm != null  and firmlyConfirm != ''">and ef.firmly_confirm = #{firmlyConfirm}</if>
+            <if test="firmlyType != null  and firmlyType != ''">and ef.firmly_type = #{firmlyType}</if>
+            <if test="firmlyState != null  and firmlyState != ''">and ef.firmly_state = #{firmlyState}</if>
+        </where>
+        )
+        ef ON m.mdid = ef.mdid
+        <where>
+            <if test="devkind != null ">and m.devkind = #{devkind}</if>
+            <if test="mdid != null ">and m.mdid = #{mdid}</if>
+        </where>
+        order by m.sort
+    </select>
+
+    <insert id="insertMdEstimateFirmly" parameterType="com.ruoyi.interfaces.domain.MdEstimateFirmly"
+            useGeneratedKeys="true">
+        insert into md_estimate_firmly
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="mdid != null">mdid,</if>
+            <if test="firmlyYr != null">firmly_yr,</if>
+            <if test="firmlyConfirm != null">firmly_confirm,</if>
+            <if test="firmlyType != null">firmly_type,</if>
+            <if test="firmlyState != null">firmly_state,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="mdid != null">#{mdid},</if>
+            <if test="firmlyYr != null">#{firmlyYr},</if>
+            <if test="firmlyConfirm != null">#{firmlyConfirm},</if>
+            <if test="firmlyType != null">#{firmlyType},</if>
+            <if test="firmlyState != null">#{firmlyState},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateMdEstimateFirmly" parameterType="com.ruoyi.interfaces.domain.MdEstimateFirmly">
+        update md_estimate_firmly
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="firmlyConfirm != null">firmly_confirm = #{firmlyConfirm},</if>
+            <if test="firmlyType != null">firmly_type = #{firmlyType},</if>
+            <if test="firmlyState != null">firmly_state = #{firmlyState},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where mdid = #{mdid}
+        and firmly_Yr = #{firmlyYr}
+    </update>
+
+    <delete id="deleteMdEstimateFirmlyByMdid" parameterType="String">
+        delete
+        from md_estimate_firmly
+        where mdid = #{mdid}
+    </delete>
+
+    <delete id="deleteMdEstimateFirmlyByMdids" parameterType="String">
+        delete from md_estimate_firmly where mdid in
+        <foreach item="mdid" collection="array" open="(" separator="," close=")">
+            #{mdid}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-api-patform/src/main/resources/mapper/interfaces/MdEstimateMapper.xml

@@ -10,8 +10,7 @@
         <result property="estimateScore"    column="estimate_score"    />
         <result property="estimateType"    column="estimate_type"    />
         <result property="remark"    column="remark"    />
-        <result property="beginTime"    column="begin_time"    />
-        <result property="endTime"    column="end_time"    />
+        <result property="estimateTime"    column="estimate_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -19,7 +18,7 @@
     </resultMap>
 
     <sql id="selectMdEstimateVo">
-        select estimate_id, mdid, estimate_score, estimate_type, remark, begin_time, end_time, create_by, create_time, update_by, update_time from md_estimate
+        select estimate_id, mdid, estimate_score, estimate_type, remark, estimate_time, create_by, create_time, update_by, update_time from md_estimate
     </sql>
 
     <select id="selectMdEstimateList" parameterType="com.ruoyi.interfaces.domain.MdEstimate" resultMap="MdEstimateResult">
@@ -28,8 +27,7 @@
             <if test="mdid != null  and mdid != ''"> and mdid = #{mdid}</if>
             <if test="estimateScore != null  and estimateScore != ''"> and estimate_score = #{estimateScore}</if>
             <if test="estimateType != null  and estimateType != ''"> and estimate_type = #{estimateType}</if>
-            <if test="beginTime != null "> and begin_time = #{beginTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
+            <if test="estimateTime != null "> and estimate_time = #{estimateTime}</if>
         </where>
     </select>
 
@@ -45,8 +43,7 @@
             <if test="estimateScore != null">estimate_score,</if>
             <if test="estimateType != null">estimate_type,</if>
             <if test="remark != null">remark,</if>
-            <if test="beginTime != null">begin_time,</if>
-            <if test="endTime != null">end_time,</if>
+            <if test="estimateTime != null">estimate_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -57,8 +54,7 @@
             <if test="estimateScore != null">#{estimateScore},</if>
             <if test="estimateType != null">#{estimateType},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="beginTime != null">#{beginTime},</if>
-            <if test="endTime != null">#{endTime},</if>
+            <if test="estimateTime != null">#{estimateTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -73,8 +69,7 @@
             <if test="estimateScore != null">estimate_score = #{estimateScore},</if>
             <if test="estimateType != null">estimate_type = #{estimateType},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="beginTime != null">begin_time = #{beginTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="estimateTime != null">estimate_time = #{estimateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -93,4 +88,10 @@
             #{estimateId}
         </foreach>
     </delete>
+    <delete id="deleteMdEstimateByMdidAndEstimateTime">
+        delete
+        from md_estimate
+        where mdid = #{mdid}
+          and estimate_time = #{estimateTime}
+    </delete>
 </mapper>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -166,7 +166,7 @@ public class SysUser extends BaseEntity
         this.email = email;
     }
 
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    //@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
     public String getPhonenumber()
     {
         return phonenumber;