Kaynağa Gözat

feat:责任岗绑定

chenjianhua 1 hafta önce
ebeveyn
işleme
3f979cb4b7

+ 1 - 0
service-base/src/main/java/com/simuwang/base/common/conts/ExcelConst.java

@@ -32,4 +32,5 @@ public class ExcelConst {
     public final static String ERROR_INCEPTION_DATE="成立日期不能晚于当前日期";
     public final static String SUCCESS="数据解析正常";
     public final static String DELETION_MANAGER_REGISTERENUMBER="投资经理和备案编码不能为空";
+    public static final String INCEPTION_ERROR_DATE_FORMAT = "对接日期格式错误,请使用YYYY-MM-dd格式";
 }

+ 1 - 1
service-base/src/main/resources/mapper/daq/ChannelMapper.xml

@@ -72,7 +72,7 @@
         info.updaterid,
         su.user_id,
         su.user_name,
-        crm.email as responbility_email
+        su.email as responbility_email
         from channel_info info
         left join channel_email_info e
         on info.id = e.channel_id and e.isvalid=1

+ 7 - 5
service-base/src/main/resources/mapper/daq/ChannelResponbilityMapper.xml

@@ -14,15 +14,17 @@
         <result column="isvalid" property="isvalid" jdbcType="INTEGER" />
     </resultMap>
     <insert id="saveChannelResponsibilityInfoDO">
-        insert into channel_responsibility_mapping(channel_id,user_id,email,creatorid,createtime,updaterid,updatetime,isvalid)
-        values (#{channelId},#{userId},#{email},#{creatorId},#{createTime},#{updaterId},#{updateTime},1)
+        insert into channel_responsibility_mapping(channel_id,user_id,creatorid,createtime,updaterid,updatetime,isvalid)
+        values (#{channelId},#{userId},#{creatorId},#{createTime},#{updaterId},#{updateTime},1)
     </insert>
     <update id="updateChannelResponsibilityInfoDO">
-        update channel_responsibility_mapping set user_id=#{userId},email=#{email},updaterid=#{updaterId},updatetime=#{updateTime} where id=#{id}
+        update channel_responsibility_mapping set user_id=#{userId},updaterid=#{updaterId},updatetime=#{updateTime},channel_id=#{channelId} where id=#{id}
     </update>
     <select id="select" resultMap="BaseResultMap">
-        select id,channel_id,user_id,email,creatorid,createtime,updaterid,updatetime,isvalid
-        from channel_responsibility_mapping where channel_id = #{channelId} and isvalid=1
+        select urm.id,urm.channel_id,urm.user_id,urm.creatorid,urm.createtime,urm.updaterid,urm.updatetime,urm.isvalid,su.email
+        from channel_responsibility_mapping urm
+        left join sys_user su on su.user_id = urm.user_id and su.isvalid=1
+        where urm.channel_id = #{channelId} and urm.isvalid=1
     </select>
 
 </mapper>

+ 1 - 1
service-manage/src/main/java/com/simuwang/manage/service/impl/ProductServiceImpl.java

@@ -356,7 +356,7 @@ public class ProductServiceImpl implements ProductService {
                     continue;
                 }
             }catch (Exception e){
-                ProductExcelFailDataVO failDataVO = toExcelFailDataVO(ExcelConst.PRODUCT_SHEET_NAME,ExcelConst.ERROR_DATE_FORMAT,idx+productStartRow);
+                ProductExcelFailDataVO failDataVO = toExcelFailDataVO(ExcelConst.PRODUCT_SHEET_NAME,ExcelConst.INCEPTION_ERROR_DATE_FORMAT,idx+productStartRow);
                 excelFailDataVOList.add(failDataVO);
                 continue;
             }