Merge remote-tracking branch 'origin/main'

ruoyi-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 18590
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ContractTableServiceImpl.java

@@ -117,14 +117,14 @@ public class ContractTableServiceImpl implements IContractTableService
             try
             {
                 // 验证是否存在这个用户
-                ContractTable u = contractTableMapper.selectContractTableByCode(con.getCode());
+                ContractTable u = contractTableMapper.selectContractTableByCode(con.getCertId());
                 if (StringUtils.isNull(u))
                 {
                     BeanValidators.validateWithException(validator, con);
                     con.setCreateBy(operName);
                     this.insertContractTable(con);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、身份证或者编码 " + con.getCode() + " 导入成功");
+                    successMsg.append("<br/>" + successNum + "、证书编码 " + con.getCertId() + " 导入成功");
                 }
                 else if (isUpdateSupport)
                 {
@@ -132,18 +132,18 @@ public class ContractTableServiceImpl implements IContractTableService
                     con.setUpdateBy(operName);
                     this.updateContractTable(con);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、身份证或者编码 " + con.getCode() + " 更新成功");
+                    successMsg.append("<br/>" + successNum + "、证书编码 " + con.getCertId() + " 更新成功");
                 }
                 else
                 {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、身份证或者编码 " + con.getCode() + " 已存在");
+                    failureMsg.append("<br/>" + failureNum + "、证书编码 " + con.getCertId() + " 已存在");
                 }
             }
             catch (Exception e)
             {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、身份证或者编码 " + con.getCode() + " 导入失败：";
+                String msg = "<br/>" + failureNum + "、证书编码 " + con.getCertId() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GradTableServiceImpl.java

@@ -123,7 +123,7 @@ public class GradTableServiceImpl implements IGradTableService
             try
             {
                 // 验证是否存在这个用户
-                GradTable u = gradTableMapper.selectGradTableById(con.getId());
+                GradTable u = gradTableMapper.selectInfoByCertId(con.getCertId());
                 if (StringUtils.isNull(u))
                 {
                     BeanValidators.validateWithException(validator, con);
@@ -134,7 +134,7 @@ public class GradTableServiceImpl implements IGradTableService
                     }
                     this.insertGradTable(con);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、ID " + con.getId() + " 导入成功");
+                    successMsg.append("<br/>" + successNum + "、证书编码 " + con.getCertId() + " 导入成功");
                 }
                 else if (isUpdateSupport)
                 {
@@ -142,18 +142,18 @@ public class GradTableServiceImpl implements IGradTableService
                     con.setUpdateBy(operName);
                     this.updateGradTable(con);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、ID " + con.getId() + " 更新成功");
+                    successMsg.append("<br/>" + successNum + "、证书编码 " + con.getCertId() + " 更新成功");
                 }
                 else
                 {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、ID " + con.getId() + " 已存在");
+                    failureMsg.append("<br/>" + failureNum + "、证书编码 " + con.getCertId() + " 已存在");
                 }
             }
             catch (Exception e)
             {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、ID " + con.getId() + " 导入失败：";
+                String msg = "<br/>" + failureNum + "、证书编码 " + con.getCertId() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }

ruoyi-system/src/main/resources/mapper/system/ContractTableMapper.xml

@@ -85,7 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="certType != null">cert_type = #{certType},</if>
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="code != null">code = #{code},</if>
-            <if test="certId != null and certId != ''">cert_id = #{certId},</if>
             <if test="certMajor != null">cert_major = #{certMajor},</if>
             <if test="issueDate != null">issue_date = #{issueDate},</if>
             <if test="validTerm != null and validTerm != ''">valid_term = #{validTerm},</if>
@@ -95,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="certContent != null">cert_content = #{certContent},</if>
             <if test="templateId != null">template_id = #{templateId},</if>
         </trim>
-        where id = #{id}
+        where cert_id = #{certId}
     </update>
 
     <delete id="deleteContractTableById" parameterType="Long">

ruoyi-system/src/main/resources/mapper/system/GradTableMapper.xml

@@ -117,7 +117,7 @@
             <if test="templateId != null">template_id = #{templateId},</if>
             <if test="year != null">year = #{year},</if>
         </trim>
-        where id = #{id}
+        where cert_id = #{certId}
     </update>
 
     <delete id="deleteGradTableById" parameterType="Integer">