yzc 1 жил өмнө
parent
commit
5c065eccd5

+ 2 - 0
hx-oa/src/main/java/com/fjhx/oa/mapper/seal/SealUseMapper.java

@@ -23,4 +23,6 @@ public interface SealUseMapper extends BaseMapper<SealUse> {
      */
     Page<SealUseVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SealUse> wrapper);
 
+    SealUseVo detail(@Param("ew") IWrapper<SealUse> wrapper);
+
 }

+ 1 - 1
hx-oa/src/main/java/com/fjhx/oa/service/erp/impl/ErpCodingGroupServiceImpl.java

@@ -84,7 +84,7 @@ public class ErpCodingGroupServiceImpl extends ServiceImpl<ErpCodingGroupMapper,
     @DSTransactional
     @Override
     public void addOrEdit(ErpCodingGroupDto erpCodingGroupDto) {
-        this.save(erpCodingGroupDto);
+        this.saveOrUpdate(erpCodingGroupDto);
         ObsFileUtil.editFile(erpCodingGroupDto.getFileList(), erpCodingGroupDto.getId());
     }
 

+ 2 - 4
hx-oa/src/main/java/com/fjhx/oa/service/seal/impl/SealUseServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.oa.service.seal.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -64,8 +63,7 @@ public class SealUseServiceImpl extends ServiceImpl<SealUseMapper, SealUse> impl
 
     @Override
     public SealUseVo detail(Long id) {
-        SealUse SealUse = this.getById(id);
-        SealUseVo result = BeanUtil.toBean(SealUse, SealUseVo.class);
+        SealUseVo result = baseMapper.detail(IWrapper.<SealUse>getWrapper().eq("su", SealUse::getId, id));
 
         setInfo(Arrays.asList(result));
         return result;
@@ -82,7 +80,7 @@ public class SealUseServiceImpl extends ServiceImpl<SealUseMapper, SealUse> impl
     @DSTransactional
     @Override
     public void addOrEdit(SealUseDto sealUseDto) {
-        this.save(sealUseDto);
+        this.saveOrUpdate(sealUseDto);
         ObsFileUtil.editFile(sealUseDto.getFileList(), sealUseDto.getId(), 10);
         ObsFileUtil.editFile(sealUseDto.getCompanyFileList(), sealUseDto.getId(), 20);
         ObsFileUtil.editFile(sealUseDto.getCustomerFileList(), sealUseDto.getId(), 30);

+ 11 - 2
hx-oa/src/main/resources/mapper/seal/SealUseMapper.xml

@@ -1,7 +1,8 @@
 <?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.fjhx.oa.mapper.seal.SealUseMapper">
-    <select id="getPage" resultType="com.fjhx.oa.entity.seal.vo.SealUseVo">
+
+    <sql id="list">
         SELECT su.id,
                su.`code`,
                su.apply_time,
@@ -30,7 +31,15 @@
                 WHERE FIND_IN_SET(sec.id, su.seal_ids)) AS sealNames
         FROM seal_use su
                  LEFT JOIN contract c ON su.contract_id = c.id
-            ${ew.customSqlSegment}
+    </sql>
+
+    <select id="getPage" resultType="com.fjhx.oa.entity.seal.vo.SealUseVo">
+        <include refid="list"/>
+        ${ew.customSqlSegment}
+    </select>
+    <select id="detail" resultType="com.fjhx.oa.entity.seal.vo.SealUseVo">
+        <include refid="list"/>
+        ${ew.customSqlSegment}
     </select>
 
 </mapper>