lyhzzz 2 gadi atpakaļ
vecāks
revīzija
042592caab

+ 6 - 0
pom.xml

@@ -60,6 +60,12 @@
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-dingtalk</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
 
         <dependency>
             <groupId>mysql</groupId>

+ 7 - 0
src/main/java/com/fdkankan/sale/service/impl/OrderReceivingServiceImpl.java

@@ -5,10 +5,14 @@ import java.util.WeakHashMap;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.sale.entity.OrderReceiving;
+import com.fdkankan.sale.entity.SysUser;
 import com.fdkankan.sale.mapper.IOrderReceivingMapper;
 import com.fdkankan.sale.service.IOrderReceivingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.sale.service.ISysUserService;
 import com.fdkankan.sale.vo.response.OrderReceivingVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -22,6 +26,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrderReceivingServiceImpl extends ServiceImpl<IOrderReceivingMapper, OrderReceiving> implements IOrderReceivingService {
 
+    @Autowired
+    ISysUserService sysUserService;
+
     @Override
     public OrderReceiving getByRepairId(String repairId) {
         LambdaQueryWrapper<OrderReceiving> wrapper = new LambdaQueryWrapper<>();

+ 5 - 1
src/main/resources/mapper/sale/OrderReceivingMapper.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.sale.mapper.IOrderReceivingMapper">
 
-    <select id="getVoByRepairId" resultType="com.fdkankan.sale.vo.response.OrderReceivingVo">
+    <resultMap id="orderMap" type="com.fdkankan.sale.vo.response.OrderReceivingVo">
+        <result column="order_fault_img" jdbcType="VARCHAR" property="orderFaultImg" typeHandler="com.fdkankan.sale.typehandle.JsonArrayTypeHandler" />
+    </resultMap>
+
+    <select id="getVoByRepairId" resultMap="orderMap">
         select  o.*,u.nick_name as sysUserName from t_order_receiving o left join sys_user u on o.sys_user_id = u.id
         where o.rec_status = 'A' and o.repair_id =#{repairId}
     </select>

+ 7 - 3
src/main/resources/mapper/sale/RepairRegisterMapper.xml

@@ -2,15 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.sale.mapper.IRepairRegisterMapper">
 
-    <select id="getVoByRepairId" resultType="com.fdkankan.sale.vo.response.RepairRegisterVo">
+    <resultMap id="repairRegisterMap" type="com.fdkankan.sale.vo.response.RepairRegisterVo">
+        <result column="check_img" jdbcType="VARCHAR" property="checkImg" typeHandler="com.fdkankan.sale.typehandle.JsonArrayTypeHandler" />
+    </resultMap>
+
+    <select id="getVoByRepairId" resultMap="repairRegisterMap">
         select  rp.*,u.nick_name as sysUserName from t_repair_register rp left join sys_user u on rp.sys_user_id = u.id
         where rp.rec_status = 'A' and rp.repair_id =#{repairId}
     </select>
-    <select id="getVoListByRepairId" resultType="com.fdkankan.sale.vo.response.RepairRegisterVo">
+    <select id="getVoListByRepairId" resultMap="repairRegisterMap">
         select  rp.*,u.nick_name as sysUserName from t_repair_register_log rp left join sys_user u on rp.sys_user_id = u.id
         where rp.rec_status = 'A' and rp.repair_id =#{repairId}
     </select>
-    <select id="getVoByRegisterLogId" resultType="com.fdkankan.sale.vo.response.RepairRegisterVo">
+    <select id="getVoByRegisterLogId" resultMap="repairRegisterMap">
         select  rp.*,u.nick_name as sysUserName from t_repair_register_log rp left join sys_user u on rp.sys_user_id = u.id
         where rp.rec_status = 'A' and rp.register_log_id =#{registerLogId}
     </select>

+ 5 - 1
src/main/resources/mapper/sale/RepairTestMapper.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.sale.mapper.IRepairTestMapper">
 
-    <select id="getPassVoByRepairId" resultType="com.fdkankan.sale.vo.response.RepairTestVo">
+    <resultMap id="testMap" type="com.fdkankan.sale.vo.response.RepairTestVo">
+        <result column="result_img" jdbcType="VARCHAR" property="resultImg" typeHandler="com.fdkankan.sale.typehandle.JsonArrayTypeHandler" />
+    </resultMap>
+
+    <select id="getPassVoByRepairId" resultMap="testMap">
         select  rt.*,u.nick_name as sysUserName from t_repair_test rt left join sys_user u on rt.sys_user_id = u.id
         where rt.rec_status = 'A' and rt.repair_id =#{repairId} and rt.result_status = 0
     </select>